[pkg-kde-commits] rev 2752 - in trunk/packages/kdebase/debian: . patches

Adeodato Simó adeodato at costa.debian.org
Fri Jan 6 14:03:38 UTC 2006


Author: adeodato
Date: 2006-01-06 14:03:24 +0000 (Fri, 06 Jan 2006)
New Revision: 2752

Added:
   trunk/packages/kdebase/debian/patches/01_kdebase_branch_r494868.diff
Modified:
   trunk/packages/kdebase/debian/changelog
Log:
kdebase branch pull.


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2006-01-06 13:55:12 UTC (rev 2751)
+++ trunk/packages/kdebase/debian/changelog	2006-01-06 14:03:24 UTC (rev 2752)
@@ -1,10 +1,14 @@
-kdebase (4:3.5.0-3) UNRELEASED; urgency=low
+kdebase (4:3.5.0-3) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
   * Install kdm's NEWS file in all kdebase packages. This ensures that
     apt-listchanges will display the news to all users. (Closes: #344947)
 
+  +++ Changes by Adeodato Simó:
+
+  * KDE_3_5_BRANCH update (up to r494868).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
 
 kdebase (4:3.5.0-2) experimental; urgency=low

Added: trunk/packages/kdebase/debian/patches/01_kdebase_branch_r494868.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/01_kdebase_branch_r494868.diff	2006-01-06 13:55:12 UTC (rev 2751)
+++ trunk/packages/kdebase/debian/patches/01_kdebase_branch_r494868.diff	2006-01-06 14:03:24 UTC (rev 2752)
@@ -0,0 +1,18532 @@
+#DPATCHLEVEL=0
+--- kate/app/kwritemain.cpp	(revision 488815)
++++ kate/app/kwritemain.cpp	(revision 494868)
+@@ -173,7 +173,7 @@
+   a=KStdAction::keyBindings(this, SLOT(editKeys()), actionCollection());
+   a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
+ 
+-  a=KStdAction::configureToolbars(this, SLOT(editToolbars()), actionCollection(), "set_configure_toolbars");
++  a=KStdAction::configureToolbars(this, SLOT(editToolbars()), actionCollection());
+   a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
+ }
+ 
+@@ -297,23 +297,19 @@
+ 
+ void KWrite::editToolbars()
+ {
++  saveMainWindowSettings( kapp->config(), "MainWindow" );
+   KEditToolbar *dlg = new KEditToolbar(guiFactory());
+-
+-  if (dlg->exec())
+-  {
+-    KParts::GUIActivateEvent ev1( false );
+-    QApplication::sendEvent( m_view, &ev1 );
+-    guiFactory()->removeClient( m_view );
+-    createShellGUI( false );
+-    createShellGUI( true );
+-    guiFactory()->addClient( m_view );
+-    KParts::GUIActivateEvent ev2( true );
+-    QApplication::sendEvent( m_view, &ev2 );
+-  }
+-
++  connect( dlg, SIGNAL(newToolbarConfig()), this, SLOT(slotNewToolbarConfig()) );
++  dlg->exec();
+   delete dlg;
+ }
+ 
++void KWrite::slotNewToolbarConfig()
++{
++  applyMainWindowSettings( kapp->config(), "MainWindow" );
++}
++
++
+ void KWrite::printNow()
+ {
+   KTextEditor::printInterface(m_view->document())->print ();
+@@ -550,7 +546,7 @@
+   QString kWriteVersion  = QString ("%1.%2.%3").arg(KDE::versionMajor() + 1).arg(KDE::versionMinor()).arg(KDE::versionRelease());
+ 
+   KAboutData aboutData ( "kwrite",
+-                         I18N_NOOP("KWrite"), 
++                         I18N_NOOP("KWrite"),
+                          kWriteVersion.latin1(),
+                          I18N_NOOP( "KWrite - Text Editor" ), KAboutData::License_LGPL_V2,
+                          I18N_NOOP( "(c) 2000-2005 The Kate Authors" ), 0, "http://kate.kde.org" );
+@@ -713,3 +709,4 @@
+ 	m_chooser->writeAppSetting();
+ 	KDialogBase::slotOk();
+ }
++// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
+--- kate/app/katemainwindow.h	(revision 488815)
++++ kate/app/katemainwindow.h	(revision 494868)
+@@ -143,6 +143,7 @@
+ 
+     void slotFileQuit();
+     void slotEditToolbars();
++    void slotNewToolbarConfig();
+     void slotWindowActivated ();
+     void slotUpdateOpenWith();
+     void documentMenuAboutToShow();
+--- kate/app/katemain.cpp	(revision 488815)
++++ kate/app/katemain.cpp	(revision 494868)
+@@ -26,6 +26,7 @@
+ #include <kglobal.h>
+ #include <kconfig.h>
+ #include <kinstance.h>
++#include <kstartupinfo.h>
+ #include <dcopclient.h>
+ #include <dcopref.h>
+ #include <kdebug.h>
+@@ -137,6 +138,8 @@
+     if (!kateApp.isEmpty())
+     {
+       kdDebug () << "kate app: " << kateApp << endl;
++      // make kdeinit happy
++      client.registerAs( "kate" );
+ 
+       DCOPRef kRef (kateApp, "KateApplication");
+ 
+@@ -189,6 +192,24 @@
+       if (nav)
+          kRef.call( "setCursor", line, column );
+ 
++      // since the user tried to open a document, let us assume [s]he
++      // wants to see that document.
++      // ### what to do about the infamous focus stealing prevention?
++      uint mwn = kRef.call("activeMainWindowNumber");
++      QCString smwn;
++      DCOPRef wRef( kateApp, QCString( "__KateMainWindow#") + smwn.setNum(mwn) );
++      if ( wRef.call("minimized") )
++      {
++        if ( wRef.call( "maximized" ) )
++          wRef.call( "maximize" );
++        else
++          wRef.call("restore");
++      }
++      wRef.call( "raise" );
++
++      // stop startup notification
++      KStartupInfo::appStarted(  );
++
+       return 0;
+     }
+   }
+@@ -198,8 +219,12 @@
+ 
+   // app execution should already end :)
+   if (app.shouldExit())
++  {
+     return 0;
++  }
+ 
+   // execute ourself ;)
+   return app.exec();
+ }
++
++// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
+--- kate/app/kateexternaltools.cpp	(revision 488815)
++++ kate/app/kateexternaltools.cpp	(revision 494868)
+@@ -308,13 +308,8 @@
+ 
+ void KateExternalToolsMenuAction::reload()
+ {
+-
+-  uint i = 0;
+-  while ( i < m_actionCollection->count() )
+-  {
+-    m_actionCollection->action( i++ )->setShortcut(KShortcut());
+-  }
+   m_actionCollection->clear ();
++  popupMenu()->clear();
+ 
+   // load all the tools, and create a action for each of them
+   KConfig *config = new KConfig( "externaltools", false, false, "appdata" );
+--- kate/app/kwritemain.h	(revision 488815)
++++ kate/app/kwritemain.h	(revision 494868)
+@@ -69,6 +69,9 @@
+     void editToolbars();
+     void changeEditor();
+ 
++  private slots:
++    void slotNewToolbarConfig();
++
+   public slots:
+     void printNow();
+     void printDlg();
+@@ -132,3 +135,4 @@
+ };
+ 
+ #endif
++// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
+--- kate/app/katemainwindow.cpp	(revision 488815)
++++ kate/app/katemainwindow.cpp	(revision 494868)
+@@ -177,11 +177,11 @@
+ 
+   readOptions();
+ 
+-  finishRestore ();
+-
+   if (sconfig)
+     m_viewManager->restoreViewConfiguration (sconfig, sgroup);
+ 
++  finishRestore ();
++
+   setAcceptDrops(true);
+ }
+ 
+@@ -277,7 +277,7 @@
+   a=KStdAction::keyBindings(this, SLOT(editKeys()), actionCollection());
+   a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
+ 
+-  a=KStdAction::configureToolbars(this, SLOT(slotEditToolbars()), actionCollection(), "set_configure_toolbars");
++  a=KStdAction::configureToolbars(this, SLOT(slotEditToolbars()), actionCollection());
+   a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
+ 
+   KAction* settingsConfigure = KStdAction::preferences(this, SLOT(slotConfigure()), actionCollection(), "settings_configure");
+@@ -384,11 +384,17 @@
+ 
+ void KateMainWindow::slotEditToolbars()
+ {
++  saveMainWindowSettings( KateApp::self()->config(), "MainWindow" );
+   KEditToolbar dlg( factory() );
+-
++  connect( &dlg, SIGNAL(newToolbarConfig()), this, SLOT(slotNewToolbarConfig()) );
+   dlg.exec();
+ }
+ 
++void KateMainWindow::slotNewToolbarConfig()
++{
++  applyMainWindowSettings( KateApp::self()->config(), "MainWindow" );
++}
++
+ void KateMainWindow::slotFileQuit()
+ {
+   KateApp::self()->shutdownKate (this);
+@@ -607,7 +613,7 @@
+   KURL::List list;
+   list.append( m_viewManager->activeView()->getDoc()->url() );
+   QString* appname = new QString( documentOpenWith->popupMenu()->text(idx) );
+-  
++
+   *appname = appname->remove('&'); //Remove a possible accelerator ... otherwise the application might not get found.
+   if ( appname->compare(i18n("Other...")) == 0 ) {
+     // display "open with" dialog
+@@ -616,19 +622,19 @@
+       KRun::run(*dlg->service(), list);
+     return;
+   }
+-  
++
+   QString qry = QString("((Type == 'Application') and (Name == '%1'))").arg( appname->latin1() );
+   KMimeType::Ptr mime = KMimeType::findByURL( m_viewManager->activeView()->getDoc()->url() );
+   KTrader::OfferList offers = KTrader::self()->query(mime->name(), qry);
+-  
++
+   if (!offers.isEmpty()) {
+     KService::Ptr app = offers.first();
+     KRun::run(*app, list);
+-  } 
+-  else 
++  }
++  else
+     KMessageBox::error(this, i18n("Application '%1' not found!").arg(appname->latin1()), i18n("Application Not Found!"));
+-  
+-  
++
++
+ }
+ 
+ void KateMainWindow::pluginHelp()
+--- kate/data/kateui.rc	(revision 488815)
++++ kate/data/kateui.rc	(revision 494868)
+@@ -1,5 +1,5 @@
+ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+-<kpartgui name="kate" version="48">
++<kpartgui name="kate" version="49">
+ 
+ <MenuBar noMerge="1">
+   <Menu name="file"><text>&amp;File</text>
+@@ -78,19 +78,19 @@
+     <Action name="fullscreen" />
+     <Separator />
+     <Action name="options_configure_keybinding"/>
+-    <Action name="set_configure_toolbars"/>
++    <Action name="options_configure_toolbars"/>
+     <Action name="settings_configure" />
+   </Menu>
+ 
+   <Menu name="window"><text>&amp;Window</text>
+     <Action name="view_new_view" />
+     <Separator />
+-    <Action name="view_new_tab"/>
++<!--    <Action name="view_new_tab"/>
+     <Action name="view_close_tab"/>
+     <Separator />
+     <Action name="view_next_tab"/>
+     <Action name="view_prev_tab"/>
+-    <Separator />
++    <Separator />-->
+     <Action name="view_split_vert"/>
+     <Action name="view_split_horiz"/>
+     <Action name="view_close_current_space" />
+--- kate/data/kwriteui.rc	(revision 488815)
++++ kate/data/kwriteui.rc	(revision 494868)
+@@ -1,5 +1,5 @@
+ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+-<kpartgui name="kwrite" version="14">
++<kpartgui name="kwrite" version="15">
+ 
+ <MenuBar>
+   <Menu name="file" noMerge="1"><text>&amp;File</text>
+@@ -55,7 +55,7 @@
+     <Action name="set_showPath" append="show_merge"/>
+     <DefineGroup name="show_merge" />
+     <DefineGroup name="configure_merge" append="save_merge"/>
+-    <Action name="set_configure_toolbars" append="configure_merge"/>
++    <Action name="options_configure_toolbars" append="configure_merge"/>
+     <Action name="settings_configure" append="configure_merge"/>
+     <Action name="settings_choose_editor" append="save_merge"/>
+   </Menu>
+--- kdepasswd/kcm/kcm_useraccount.desktop	(revision 488815)
++++ kdepasswd/kcm/kcm_useraccount.desktop	(revision 494868)
+@@ -126,7 +126,7 @@
+ Comment[eu]=Erabiltzaileari buruzko informazioa; pasahitza, izena eta posta-helbidea, adibidez.
+ Comment[fi]=Käyttäjien tiedot, kuten salasanat, nimet ja sähköpostiosoite
+ Comment[fr]=Informations sur l'utilisateur, comme le mot de passe, le nom, et l'adresse électronique
+-Comment[fy]=brûkersynformaasje sa as wachtwurd, namme en e adres
++Comment[fy]=Brûkersynformaasje sa as wachtwurd, namme en e-adres
+ Comment[gl]=Informazón do usuário como contrasinal, nome e correo-e
+ Comment[he]=מידע אישי כגון ססמה, שם וכתובת דוא"ל
+ Comment[hi]=उपयोक्ता जानकारी जैसे कि पासवर्ड, नाम तथा ई-मेल
+--- kcontrol/background/bgrender.cpp	(revision 488815)
++++ kcontrol/background/bgrender.cpp	(revision 494868)
+@@ -978,7 +978,7 @@
+         fp += m_renderer[i]->fingerprint();
+     }
+     int h = QHash(fp);
+-    kdDebug() << k_funcinfo << " fp=\""<<fp<<"\" h="<<h<<endl;
++    //kdDebug() << k_funcinfo << " fp=\""<<fp<<"\" h="<<h<<endl;
+     return QHash(fp);
+ }
+ 
+--- kcontrol/krdb/kcs/Next.kcsrc	(revision 488815)
++++ kcontrol/krdb/kcs/Next.kcsrc	(revision 494868)
+@@ -26,6 +26,7 @@
+ Name[eo]=Neksto
+ Name[es]=NeXT
+ Name[fa]=بعدی
++Name[fy]=Fierder
+ Name[ga]=Ar Aghaidh
+ Name[hi]=अगला
+ Name[km]=បន្ទាប់
+--- kcontrol/krdb/kcs/WhiteOnBlack.kcsrc	(revision 488815)
++++ kcontrol/krdb/kcs/WhiteOnBlack.kcsrc	(revision 494868)
+@@ -12,7 +12,7 @@
+ Name[eu]=Kontraste handiko testu zuria
+ Name[fi]=Suuren värikontrastin valkoinen teksti
+ Name[fr]=Texte en blanc avec contraste élevé
+-Name[fy]=Heech kontrast wyte tekst
++Name[fy]=Heech kontrast wite tekst
+ Name[gl]=Texto Branco de Alto Contraste
+ Name[he]=ניגודיות גבוהה עם טקסט לבן
+ Name[hu]=Erősen kontrasztos fehér szöveg
+--- kcontrol/usbview/usbdb.cpp	(revision 488815)
++++ kcontrol/usbview/usbdb.cpp	(revision 494868)
+@@ -8,6 +8,7 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
++#include <config.h>
+ 
+ #include <iostream>
+ 
+@@ -24,7 +25,11 @@
+ 
+ USBDB::USBDB()
+ {
++#ifndef USBIDS_FILE
+   QString db = locate("data", "kcmusb/usb.ids");
++#else
++  QString db = USBIDS_FILE;
++#endif
+   if (db.isEmpty())
+     return;
+ 
+--- kcontrol/usbview/Makefile.am	(revision 488815)
++++ kcontrol/usbview/Makefile.am	(revision 494868)
+@@ -14,6 +14,8 @@
+ 
+ xdg_apps_DATA = kcmusb.desktop
+ 
++if install_usbids
+ usb_DATA = usb.ids
+ usbdir = $(kde_datadir)/kcmusb
++endif
+ 
+--- kcontrol/usbview/configure.in.in	(revision 488815)
++++ kcontrol/usbview/configure.in.in	(revision 494868)
+@@ -1,10 +1,16 @@
+ case "$host" in
+-  *-*-linux*)
++  *-*-linux*|*-*-freebsd*)
+ 	FOUND_USBVIEW=yes
+ 	;;
+-  *-*-freebsd*)
+-	FOUND_USBVIEW=yes
+-	;;
+ esac
+ 
+ AM_CONDITIONAL(include_kcontrol_usbview, test "$FOUND_USBVIEW" = "yes")
++
++AC_ARG_WITH([usbids], AC_HELP_STRING([--with-usbids=PATH], [Use the usb.ids file at the specified path, instead of the local copy]))
++
++if test "x$with_usbids" != "x" && test "x$with_usbids" != "xno"; then
++  AC_DEFINE_UNQUOTED(USBIDS_FILE, "$with_usbids", [Path for the usb.ids file to use])
++  dont_install_usbids="yes"
++fi
++
++AM_CONDITIONAL(install_usbids, test "x$dont_install_usbids" != "xyes")
+--- kcontrol/usbview/kcmusb.desktop	(revision 488815)
++++ kcontrol/usbview/kcmusb.desktop	(revision 494868)
+@@ -102,7 +102,7 @@
+ Comment[fa]=نمایش دستگاه‌های USB متصل به این سیستم
+ Comment[fi]=Näyttää tietokoneeseen liitetyt USB-laitteet
+ Comment[fr]=Affiche les périphériques USB attachés à cet ordinateur
+-Comment[fy]=Hjir kint de USB-apparaten besjen die op dizze kompjûter oansluten binne
++Comment[fy]=Hjir konne jo de USB-apparaten besjen die op dizze kompjûter oansluten binne
+ Comment[ga]=Taispeáin na gléasanna USB ceangailte leis an ríomhaire seo
+ Comment[gl]=Ver os dispositivos USB conectados a este computador
+ Comment[he]=מידע על התקני ה־USB המחוברים למחשב זה
+--- kcontrol/componentchooser/EXAMPLE.desktop	(revision 488815)
++++ kcontrol/componentchooser/EXAMPLE.desktop	(revision 494868)
+@@ -16,7 +16,7 @@
+ Name[et]=Mõni kena nimi, mille sa oma liidesele valinud oled
+ Name[eu]=Zure interfazerako aukeratu duzun izen dotorea
+ Name[fa]=اسم زیبایی که برای رابطتان انتخاب کرده‌اید
+-Name[fi]=Kiva nimi rajapinnallesi
++Name[fi]=Valittu nimi rajapinnalle
+ Name[fo]=Navn markamótsins
+ Name[fr]=Un joli nom que vous avez choisi pour votre interface
+ Name[fy]=In namme dy jo koazen ha foar jo ynterface
+--- kcontrol/componentchooser/componentchooser.cpp	(revision 488815)
++++ kcontrol/componentchooser/componentchooser.cpp	(revision 494868)
+@@ -405,7 +405,7 @@
+ 	if (!it) return;
+ 
+ 	if (somethingChanged) {
+-		if (KMessageBox::questionYesNo(this,i18n("<qt>You changed the default component of your choice, do want to save that change now ?</qt>"),QString::null,KStdGuiItem::save(),KStdGuiItem::discard())==KMessageBox::Yes) save();
++		if (KMessageBox::questionYesNo(this,i18n("<qt>You changed the default component of your choice. Do you want to save that change now?</qt>"),QString::null,KStdGuiItem::save(),KStdGuiItem::discard())==KMessageBox::Yes) save();
+ 	}
+ 	KSimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File);
+ 
+--- kcontrol/componentchooser/componentservices/kcm_kemail.desktop	(revision 488815)
++++ kcontrol/componentchooser/componentservices/kcm_kemail.desktop	(revision 494868)
+@@ -89,7 +89,7 @@
+ Comment[et]=See teenus võimaldab sul määrata kindlaks vaikimisi kasutatava meilikliendi. Kõik KDE rakendused, mis vajavad mingil moel meilklienti, peaksid arvestama selle seadega.
+ Comment[eu]=Zerbitzu honen bidez zure posta eletronikoko bezero lehenetsia konfigura dezakezu. Posta elektroniko bezeroa behar duten KDE aplikazio guztiek ezarpen hau errespetatu egin beharko lukete.
+ Comment[fa]=این سرویس کارگیر پیش‌فرض پست‌الکترونیتان را تنظیم می‌کند. تمام نرم‌افزارهای KDE که نیاز به دسترسی به‌ کارگیر پست الکترونیکی دارند از این تنظیمات تبعیت خواهند کرد.
+-Comment[fi]=Tämän palvelun avulla voit määritellä oletussähköpostiohjelman. Kaikki KDE-sovellukset, jotka käyttävät sähköpostiohjelmaa, käyttävät tätä asetusta.
++Comment[fi]=Tämän palvelun avulla voit määritellä oletussähköpostiohjelman. Kaikki sähköpostiohjelmaa käyttävätKDE-sovellukset huomioivat tämän asetuksen.
+ Comment[fr]=Ce service vous permet de configurer votre client de courrier par défaut. Toutes les applications KDE qui ont besoin d'accéder à un client de courrier électronique doivent accepter ce réglage.
+ Comment[fy]=Mei dizze tsjinst kinne jo de standert e-postprogramma ynstelle. KDE-tapassingen dy tagong ta in e-postprogramma neadich ha sille dizze ynstellings brûke.
+ Comment[gl]=Este servizo permite-lle configurar o seu cliente de correo predeterminado. Todas as aplicazóns de KDE que precisen aceso á aplicazón de correo electrónico deberian ter en conta esta opzón.
+--- kcontrol/componentchooser/componentservices/kcm_browser.desktop	(revision 488815)
++++ kcontrol/componentchooser/componentservices/kcm_browser.desktop	(revision 494868)
+@@ -20,7 +20,7 @@
+ Name[fi]=WWW-selain
+ Name[fo]=Vevlesari
+ Name[fr]=Navigateur web
+-Name[fy]=Webbrowser
++Name[fy]=Webblêder
+ Name[ga]=Brabhsálaí Lín
+ Name[gl]=Navegador Web
+ Name[he]=דפדפן
+@@ -87,9 +87,9 @@
+ Comment[es]=Este servicio le permite configurar su navegador de Internet predeterminado. Todas las aplicaciones KDE que precisan acceso a hiperenlaces deberían reconocer esta opción.
+ Comment[et]=Siin saab seadistada vaikimisi kasutatavat veebilehitsejat. Kõik KDE rakendused, kus saab valida hüperlinke, peaksid siinsete seadistustega arvestama.
+ Comment[eu]=Hemen zure web arakatzaile lehenetsia konfigura dezakezu. Aukera honek estekak darabiltzaten KDEren aplikazio guztiei eragin behar die.
+-Comment[fi]=Tämän palvelun avulla voit määritellä oletusselaimen. Kaikki KDE-sovellukset, jotka käyttävät selainta, käyttävät tätä asetusta.
++Comment[fi]=Tämän palvelun avulla voit määritellä oletusselaimen. Kaikki selainta käyttävät KDE-sovellukset huomioivat tämän asetuksen.
+ Comment[fr]=Ce service vous permet de configurer votre navigateur internet par défaut. Toutes les applications KDE permettant de cliquer sur un lien hypertexte doivent accepter ce réglage.
+-Comment[fy]=Hjir kinne jp de standert web blêder ynstelle. Alle KDE-tapassingen weryn jo in hyperskeakel oanklikke kinne brûk meitsje fan dizze ynstelling
++Comment[fy]=Hjir kinne jo de standert web blêder ynstelle. Alle KDE-tapassingen weryn jo in hyperskeakel oanklikke kinne brûk meitsje fan dizze ynstelling
+ Comment[gl]=Aqui pode configurar o seu navegador predeterminado. Todas as aplicazóns de KDE nas que poda premer en ligazóns farán uso deste.
+ Comment[he]=שירות זה מאפשר לך להגדיר את תוכנית הדוא"ל שתשמש כברירת מחדל. כל יישומי KDE שיזדקקו לגישה אל תוכנית דוא"ל יתחשבו בהגדרה זו.
+ Comment[hi]=यहाँ पर आप अपने डिफ़ॉल्ट वेब ब्राउज़र को कॉन्फ़िगर कर सकते हैं. सभी केडीई अनुप्रयोगों में जिसमें हायपरलिंक चुन सकते हैं, वे इस विन्यास का इस्तेमाल करेंगे.
+--- kcontrol/componentchooser/componentservices/kcm_terminal.desktop	(revision 488815)
++++ kcontrol/componentchooser/componentservices/kcm_terminal.desktop	(revision 494868)
+@@ -89,7 +89,7 @@
+ Comment[et]=See teenus võimaldab sul määrata kindlaks vaikimisi kasutatava terminaliemulaatori. Kõik KDE rakendused, mis vajavad mingil moel terminaliemulaatorit, peaksid arvestama selle seadega.
+ Comment[eu]=Zerbitzu honen bidez zure terminal emuladore lehenetsia konfiguradezakezu. Terminal emuladore bati deitzen dioten KDEren aplikazio guztiek ezarpen hau onartu egin beharko lukete.
+ Comment[fa]=این سرویس به شما اجازه میدهد شبیه ساز پایانه پیش‌فرضتان را تنظیم کنید.تمام نرم‌افزارهای KDE که به شبیه‌ساز پایانه نیاز دارند به این تنظیمات احترام خواهند گذاشت.
+-Comment[fi]=Tämän palvelun avulla voit asettaa oletus-komentoikkunaa. Kaikki KDE-sovellukset, jotka käynnistävät komentoikkunan, käyttävät tätä asetusta.
++Comment[fi]=Tämän palvelun avulla voit asettaa oletus-komentoikkunaa. Kaikki komentoikkunaa käyttävät KDE-sovellukset huomioivat tämän asetuksen.
+ Comment[fr]=Ce service vous permet de configurer votre émulateur de terminal par défaut. Toutes les applications KDE qui appellent une application d'émulation de terminal doivent accepter ce réglage.
+ Comment[fy]=Mei dizze tsjinst kinne jo de standert terminalemulator ynstelle. Alle KDE-tapassingen dy in terminalemulator oanroppe sille brûk meitsje fan dizze ynstelling.
+ Comment[gl]=Este servizo permite-lle configurar o seu emulador de terminal predeterminado. Todas as aplicazóns de KDE que invoquen a un emulador de terminal deberian facer caso desta opzón.
+--- kcontrol/taskbar/kcmtaskbar.desktop	(revision 488815)
++++ kcontrol/taskbar/kcmtaskbar.desktop	(revision 494868)
+@@ -100,7 +100,7 @@
+ Comment[fa]=نوار‌ابزار صفحه‌کنترل را تنظیم کنید
+ Comment[fi]=Muokkaa paneelin tehtäväpalkkia
+ Comment[fr]=Configuration de la barre des tâches du tableau de bord
+-Comment[fy]=Hjir kinst de taakbalke fan it paniel ynstelle
++Comment[fy]=Hjir kinne jo de taakbalke fan it paniel ynstelle
+ Comment[gl]=Configurar a barra de tarefas do painel
+ Comment[he]=הגדר שורת המשימות של הלוח
+ Comment[hi]=फलक कार्यपट्टी कॉन्फ़िगर करें
+--- kcontrol/kcontrol/helpwidget.cpp	(revision 488815)
++++ kcontrol/kcontrol/helpwidget.cpp	(revision 494868)
+@@ -41,7 +41,7 @@
+   else if (docPath.isEmpty())
+     helptext = text;
+   else
+-    helptext = (text + i18n("<p>Use the \"Whats This\" (Shift+F1) to get help on specific options.</p><p>To read the full manual click <a href=\"%1\">here</a>.</p>")
++    helptext = (text + i18n("<p>Use the \"What's This?\" (Shift+F1) to get help on specific options.</p><p>To read the full manual click <a href=\"%1\">here</a>.</p>")
+ 		      .arg(docPath.local8Bit()));
+ }
+ 
+--- kcontrol/input/mouse.cpp	(revision 488815)
++++ kcontrol/input/mouse.cpp	(revision 494868)
+@@ -372,6 +372,7 @@
+       { VENDOR_LOGITECH, 0xC508, "C-BA4-MSE", "Cordless Optical TrackMan", HAS_SS | HAS_CSR },
+       { VENDOR_LOGITECH, 0xC50B, "967300-0403", "Cordless MX Duo Receiver", HAS_SS|HAS_CSR },
+       { VENDOR_LOGITECH, 0xC50E, "M-RAG97", "MX1000 Laser Mouse", HAS_SS | HAS_CSR },
++      { VENDOR_LOGITECH, 0xC512, "M-RAK89B", "Cordless Desktop Pro LX700", HAS_CSR | USE_CH2 },
+       { VENDOR_LOGITECH, 0xC702, "C-UF15", "Receiver for Cordless Presenter", HAS_CSR },
+       { 0, 0, QString(), QString(), 0 }
+   };
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders.i18n	(revision 488815)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders.i18n	(revision 494868)
+@@ -1,14 +0,0 @@
+-i18n("NOTE_TO_THE_TRANSLATORS",
+-     "By default, the web shortcuts will all go to the\n"
+-     "international versions of each site (e.g. google.com),\n"
+-     "not to the local site (e.g. google.de).  To change this,\n"
+-     "add extra 'Query[foo]=...' lines to the .desktop files\n"
+-     "in kdebase/kcontrol/ebrowsing/plugins/ikws/searchproviders.\n"
+-     "For example, in google.desktop, copy the original\n"
+-     "Query=...\n"
+-     "line to\n"
+-     "Query[foo]=...\n"
+-     "and change its URL so it uses google.foo instead of google.com.\n"
+-     "(translate this message as DONE when you have added the extra\n"
+-     "query URLs; otherwise, leave it untranslated as a reminder.)");
+-
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/google_images.desktop	(revision 488815)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/google_images.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[fi]=Googlen kuvahaku
+ Name[fo]=Google (myndaleiting)
+ Name[fr]=Recherche d'images avec Google
+-Name[fy]=Google ôfbyldings sykje
++Name[fy]=Google printsjesykjen
+ Name[ga]=Cuardach Íomhá Google
+ Name[gl]=Procura de Imaxes de Google
+ Name[he]=חיפוש תמונות של גוגל
+@@ -77,7 +77,6 @@
+ Query=http://images.google.com/images?q=\\{@}
+ Query[en_GB]=http://images.google.co.uk/images?q=\\{@}
+ Query[fr]=http://images.google.fr/images?q=\\{@}
+-Query[fy]=http://images.google.nl/images?q=\\{@}
+ Query[he]=http://images.google.co.il/images?q=\\{@}
+ Query[nb]=http://images.google.no/images?hl=nn&q=\\{@}
+ Query[nl]=http://images.google.nl/images?q=\\{@}
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/google_groups.desktop	(revision 488815)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/google_groups.desktop	(revision 494868)
+@@ -71,7 +71,6 @@
+ Query=http://groups.google.com/groups?oi=djq&as_q=\\{@}
+ Query[en_GB]=http://groups.google.co.uk/groups?oi=djq&as_q=\\{@}
+ Query[fr]=http://groups.google.fr/groups?oi=djq&as_q=\\{@}
+-Query[fy]=http://groups.google.nl/groups?oi=djq&as_q=\\{@}
+ Query[he]=http://groups.google.co.il/groups?oi=djq&as_q=\\{@}
+ Query[nb]=http://groups.google.no/groups?hl=nn&oi=djq&as_q=\\{@}
+ Query[nl]=http://groups.google.nl/groups?oi=djq&as_q=\\{@}
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop	(revision 488815)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop	(revision 494868)
+@@ -50,7 +50,7 @@
+ Keys=wt,wikt
+ Query=http://en.wiktionary.org/wiki/Special:Search?search=\{@}&go=Go
+ Query[fr]=http://fr.wiktionary.org/wiki/Special:Search?search=\{@}&go=Go
+-Query[fy]=http://nl.wiktionary.org/wiki/Special:Search?search=\{@}&go=Go
++Query[fy]=http://fy.wiktionary.org/wiki/Special:Search?search=\{@}&go=Go
+ Query[nb]=http://no.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
+ Query[nl]=http://nl.wiktionary.org/wiki/Special:Search?search=\{@}&go=Go
+ Query[nn]=http://en.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop	(revision 488815)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop	(revision 494868)
+@@ -76,7 +76,6 @@
+ Query[es]=http://www.google.com/search?as_q=\\{all,@}&num=\\{num,"10"}&btnG=Google+Search&as_epq=\\{exact,""}&as_oq=\\{any,""}&as_eq=\\{without,""}&lr=\\{lang,""}&as_ft=\\{ft,"i"}&as_filetype=\\{filetype,""}&as_qdr=\{date,"all"}&as_occt=\\{occ,"any"}&as_dt=\\{siteop,"i" }&as_sitesearch=\\{site}&safe=\\{safe, "active"}&ie=UTF-8&oe=UTF-8
+ Query[fi]=http://www.google.fi/search?as_q=\\{all,@}&num=\\{num,"10"}&btnG=Google+Search&as_epq=\\{exact,""}&as_oq=\\{any,""}&as_eq=\\{without,""}&lr=\\{lang,""}&as_ft=\\{ft,"i"}&as_filetype=\\{filetype,""}&as_qdr=\{date,"all"}&as_occt=\\{occ,"any"}&as_dt=\\{siteop,"i"}&as_sitesearch=\\{site}&safe=\\{safe,"active"}&ie=UTF-8&oe=UTF-8
+ Query[fr]=http://www.google.fr/search?as_q=\\{all,@}&num=\\{num,"10"}&btnG=Google+Search&as_epq=\\{exact,""}&as_oq=\\{any,""}&as_eq=\\{without,""}&lr=\\{lang,""}&as_ft=\\{ft,"i"}&as_filetype=\\{filetype,""}&as_qdr=\{date,"all"}&as_occt=\\{occ,"any"}&as_dt=\\{siteop,"i"}&as_sitesearch=\\{site}&safe=\\{safe,"active"}&ie=UTF-8&oe=UTF-8
+-Query[fy]=http://www.google.nl/search?as_q=\\{all,@}&num=\\{num,"10"}&btnG=Google+Search&as_epq=\\{exact,""}&as_oq=\\{any,""}&as_eq=\\{without,""}&lr=\\{lang,""}&as_ft=\\{ft,"i"}&as_filetype=\\{filetype,""}&as_qdr=\{date,"all"}&as_occt=\\{occ,"any"}&as_dt=\\{siteop,"i"}&as_sitesearch=\\{site}&safe=\\{safe,"active"}&ie=UTF-8&oe=UTF-8
+ Query[he]=http://www.google.co.il/search?as_q=\\{all,@}&num=\\{num,"10"}&btnG=Google+Search&as_epq=\\{exact,""}&as_oq=\\{any,""}&as_eq=\\{without,""}&lr=\\{lang,""}&as_ft=\\{ft,"i"}&as_filetype=\\{filetype,""}&as_qdr=\{date,"all"}&as_occt=\\{occ,"any"}&as_dt=\\{siteop,"i"}&as_sitesearch=\\{site}&safe=\\{safe,"active"}&ie=UTF-8&oe=UTF-8
+ Query[nb]=http://www.google.no/search?as_q=\\{all,@}&num=\\{num,"10"}&btnG=Google+Search&as_epq=\\{exact,""}&as_oq=\\{any,""}&as_eq=\\{without,""}&lr=\\{lang,""}&as_ft=\\{ft,"i"}&as_filetype=\\{filetype,""}&as_qdr=\{date,"all"}&as_occt=\\{occ,"any"}&as_dt=\\{siteop,"i"}&as_sitesearch=\\{site}&safe=\\{safe,"active"}&ie=UTF-8&oe=UTF-8
+ Query[nl]=http://www.google.nl/search?as_q=\\{all,@}&num=\\{num,"10"}&btnG=Google+Search&as_epq=\\{exact,""}&as_oq=\\{any,""}&as_eq=\\{without,""}&lr=\\{lang,""}&as_ft=\\{ft,"i"}&as_filetype=\\{filetype,""}&as_qdr=\{date,"all"}&as_occt=\\{occ,"any"}&as_dt=\\{siteop,"i"}&as_sitesearch=\\{site}&safe=\\{safe,"active"}&ie=UTF-8&oe=UTF-8
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/google.desktop	(revision 488815)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/google.desktop	(revision 494868)
+@@ -18,7 +18,6 @@
+ Query[en_GB]=http://www.google.co.uk/search?q=\\{@}&ie=UTF-8&oe=UTF-8
+ Query[fi]=http://www.google.fi/search?q=\\{@}&ie=UTF-8&oe=UTF-8
+ Query[fr]=http://www.google.fr/search?q=\\{@}&ie=UTF-8&oe=UTF-8
+-Query[fy]=http://www.google.nl/search?q=\\{@}&ie=UTF-8&oe=UTF-8
+ Query[he]=http://www.google.co.il/search?q=\\{@}&ie=UTF-8&oe=UTF-8
+ Query[it]=http://www.google.it/search?q=\\{@}&ie=UTF-8&oe=UTF-8
+ Query[nb]=http://www.google.no/search?q=\\{@}&ie=UTF-8&oe=UTF-8
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/google_news.desktop	(revision 488815)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/google_news.desktop	(revision 494868)
+@@ -66,7 +66,6 @@
+ Query[en_GB]=http://news.google.co.uk/news?q=\\{@}&ie=UTF-8&oe=UTF-8
+ Query[fi]=http://news.google.fi/news?q=\\{@}&ie=UTF-8&oe=UTF-8
+ Query[fr]=http://news.google.fr/news?q=\\{@}&ie=UTF-8&oe=UTF-8
+-Query[fy]=http://news.google.nl/news?q=\\{@}&ie=UTF-8&oe=UTF-8
+ Query[he]=http://news.google.co.il/news?q=\\{@}&ie=UTF-8&oe=UTF-8
+ Query[it]=http://news.google.it/news?q=\\{@}&ie=UTF-8&oe=UTF-8
+ Query[nb]=http://news.google.no/news?q=\\{@}&ie=UTF-8&oe=UTF-8
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop	(revision 488815)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop	(revision 494868)
+@@ -14,6 +14,7 @@
+ Name[eu]=Irekitako direktorioa
+ Name[fi]=Avoin kansio
+ Name[fo]=Opin Alnótsskránni
++Name[fy]=Iepen Directory
+ Name[gl]=Directorio Aberto
+ Name[he]=תיקייה פתוחה
+ Name[hi]=ओपन डिरेक्ट्री
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/grec.desktop	(revision 488815)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/grec.desktop	(revision 494868)
+@@ -9,7 +9,7 @@
+ Name[ca]=Gran diccionari de la Llengua Catalana (Grup Enciclopèdia Catalana)
+ Name[cs]=Velký katalánský slovník (GRan Enciclopèdia  Catalana)
+ Name[da]=Storartet ordbog for det katalanske sprog (GRan Enciclopèdia  Catalana)
+-Name[de]=Großes Wörterbuch der Katalanischen Sprache (GRan Enciclopèdia  Catalana)
++Name[de]=Großes Wörterbuch der Katalanischen Sprache (GRan Enciclopèdia Catalana)
+ Name[el]=Μεγάλο Λεξικό της Καταλανικής Γλώσσας  (GRan Enciclopèdia  Catalana)
+ Name[es]=Gran enciclopedia catalana
+ Name[et]=Suur katalaani sõnaraamat (GRan Enciclopèdia  Catalana)
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop	(revision 488815)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop	(revision 494868)
+@@ -72,7 +72,6 @@
+ Query[en_GB]=http://www.google.co.uk/search?q=\\{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8
+ Query[fi]=http://www.google.fi/search?q=\\{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8
+ Query[fr]=http://www.google.fr/search?q=\\{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8
+-Query[fy]=http://www.google.nl/search?q=\\{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8
+ Query[he]=http://www.google.co.il/search?q=\\{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8
+ Query[it]=http://www.google.it/search?q=\\{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8
+ Query[nb]=http://www.google.no/search?q=\\{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop	(revision 488815)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop	(revision 494868)
+@@ -70,6 +70,7 @@
+ Query[de]=http://de.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
+ Query[fi]=http://fi.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
+ Query[fr]=http://fr.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
++Query[fy]=http://fy.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
+ Query[it]=http://it.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
+ Query[nb]=http://no.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
+ Query[nl]=http://nl.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
+--- kcontrol/ebrowsing/ebrowsing.desktop	(revision 488815)
++++ kcontrol/ebrowsing/ebrowsing.desktop	(revision 494868)
+@@ -100,7 +100,7 @@
+ Comment[fa]=مرور پیشرفته‌ی خود را تنظیم کنید
+ Comment[fi]=Muokkaa selaimen lisäasetuksia
+ Comment[fr]=Configuration de la navigation avancée
+-Comment[fy]=Hjir kinst avansearre blêdzjen ynstelle
++Comment[fy]=Hjir kinne jo avansearre blêdzjen ynstelle
+ Comment[ga]=Cumraigh brabhsáil fheabhsaithe
+ Comment[gl]=Configurar a Navegazón Mellorada
+ Comment[he]=שינוי הגדרות הגלישה המשופרת
+--- kcontrol/ebrowsing/Makefile.am	(revision 488815)
++++ kcontrol/ebrowsing/Makefile.am	(revision 494868)
+@@ -16,6 +16,6 @@
+ 
+ messages: rc.cpp
+ 	$(EXTRACTRC) plugins/*/*.ui >> rc.cpp
+-	$(XGETTEXT) plugins/ikws/searchproviders.i18n *.cpp plugins/ikws/*.cpp plugins/shorturi/*.cpp -o $(podir)/kcmkurifilt.pot
++	$(XGETTEXT) *.cpp plugins/ikws/*.cpp plugins/shorturi/*.cpp -o $(podir)/kcmkurifilt.pot
+ 
+ xdg_apps_DATA = ebrowsing.desktop
+--- kcontrol/locale/language.desktop	(revision 488815)
++++ kcontrol/locale/language.desktop	(revision 494868)
+@@ -103,7 +103,7 @@
+ Comment[fa]=تنظیمات زبان ، ارقام و زمان برای منطقه‌ی شما
+ Comment[fi]=Alueen kielen, ajan ja lukujen asetukset
+ Comment[fr]=Configuration de la langue, des nombres, et du format d'heure
+-Comment[fy]=Taal-, numeryk, en tiidsynstelling foar dyn eigen regio
++Comment[fy]=Taal-, numeryk, en tiidsynstelling foar jo eigen regio
+ Comment[gl]=Lingua e parámetros numéricos/horarios para a sua rexión particular
+ Comment[he]=שינוי הגדרות השפה, המספרים והשעה עבור האזור הייחודי שלך
+ Comment[hi]=भाषा,अंकीय, तथा आपके विशेष क्षेत्र के लिए समय विन्यास
+--- kcontrol/access/eventsrc	(revision 488815)
++++ kcontrol/access/eventsrc	(revision 494868)
+@@ -49,6 +49,7 @@
+ Name[af]='n Verandering sleutel was geaktiveer
+ Name[bg]=Клавиш модификатор е активен
+ Name[ca]=S'ha activat una tecla modificadora
++Name[cs]=Modifikační klávesa se stala aktivní
+ Name[da]=En ændringstast er blevet aktiv
+ Name[de]=Eine Sondertaste ist aktiv
+ Name[el]=Ενεργοποιήθηκε ένα πλήκτρο τροποποιητή
+@@ -85,44 +86,24 @@
+ Name[uk]=Клавішу-модифікатор активовано
+ Name[zh_CN]=修饰键变为激活
+ Name[zh_TW]=輔助按鍵值已變為作用中
+-Comment=A modifier key (e.g., Shift or Control) has changed its state and is now active
+-Comment[af]='n Verandering sleutel (bv. Shift of Control) se status het verander en is nou aktief
+-Comment[bg]=Клавиш модификатор (Shift или Ctrl) си промени състоянието и е активен сега
+-Comment[da]=En ændringstast (f.eks., Shift eller Control) har ændret sin tilstand og er nu aktive
+-Comment[de]=Eine Sondertaste (z. B. Umschalt + Strg) hat ihren Status geändert und ist jetzt aktiv
++Comment=A modifier key (e.g. Shift or Ctrl) has changed its state and is now active
++Comment[cs]=Modifikační kláves (např. Shift nebo Control) změnila svůj stav a je nyní aktivní.
++Comment[da]=En ændringstast (f.eks., Shift eller Ctrl) har ændret sin tilstand og er nu aktiv
+ Comment[el]=Άλλαξε η κατάσταση ενός πλήκτρου τροποποιητή (π.χ. Shift ή Control) και τώρα είναι ενεργό
+-Comment[en_GB]=A modifier key (e.g. Shift or Ctrl) has changed its state and is now active
+ Comment[es]=Una tecla modificadora (p.ej. Mayúsculas o Control) ha cambiado su estado y está activa ahora
+-Comment[et]=Muuteklahv (nt. Shift või Control) muutis oma olekut ning on nüüd aktiivne
+-Comment[eu]=Tekla aldatzaile bat (hau da, Shift edo Kontrol) egoeraz aldatu da eta orain aktiboa da
+-Comment[fi]=Muunnosnäppäin (esim. Shift tai Ctrl) on vaihtanut tilaa ja on nyt aktiivinen
++Comment[et]=Muuteklahv (nt. Shift või Ctrl) muutis oma olekut ning on nüüd aktiivne
+ Comment[fr]=L'état d'une touche de modification (ex : Maj ou Ctrl.) est modifié et elle est maintenant active.
+-Comment[fy]=De tastân fan in modifikaasjetoets (sa as Shift of Control) is wizige en no aktyf.
+-Comment[gl]=Unha tecla modificadora (ex. Alt ou Control) mudou de estado e agora está activa
++Comment[fy]=De tastân fan in modifikaasjetoets (sa as Shift of Control) is feroare en is no aktyf.
+ Comment[hu]=Egy módosító billentyű (pl. a Shift vagy a Ctrl) állapota aktívvá változott
+-Comment[is]=Breytilykill (Shift eða Control) hefur breytt um stöðu og er nú virkur
+-Comment[it]=Un tasto modificatore (es. shift o control) ha cambiato stato ed è diventato attivo
+-Comment[ja]=修飾キー (Shift や Control など) が変更され、状態は現在アクティブになっています
+-Comment[km]=គ្រាប់ចុច​កែប្រែ​មួយ (ឧ. ប្តូរ ឬ ពាក្យ​បញ្ជា) បាន​ផ្លាស់ប្តូរ​សភាព​របស់​វា ហើយ ឥឡូវ​នេះ​សកម្ម
++Comment[is]=Breytilykill (Shift eða Ctrl) hefur breytt um stöðu og er nú virkur
+ Comment[lt]=Klavišo - modifikatoriaus (pvz., Lyg2(Shift) arba Vald(Ctrl)) būsena pakito ir jis dabar - aktyvus
+-Comment[mk]=Некое копче за модификација (пр. Shift или Control) си ја смени состојбата и сега е активно
+-Comment[nb]=En valgtast (e.g. «Shift» eller «Control») har endret statusen og er ikke i bruk.
+ Comment[nds]=En Sünnertast (t.B. Ümschalt oder Strg) hett den Tostand ännert un is nu aktiv
+-Comment[nl]=De status van een modificatietoets (zoals Shift of Control) is gewijzigd en is nu actief.
+-Comment[pl]=Klawisz modyfikujący (np. Shift lub Control) zmienił stan i jest teraz włączony
+-Comment[pt]=Uma tecla modificadora (p.ex., o Shift ou o Control) mudou o seu estado e ficou activa
+-Comment[pt_BR]=Uma tecla modificadora  (por exemplo, Shift ou Control) modificou seu estado e agora tornou-se ativa
+-Comment[ru]=Нажата клавиша модификатора (например, Shift или Ctrl)
+-Comment[se]=Válljenboallu (nugo Shift dahje Control) lea rievdadan stáhtusa lea dál aktiivalaš
+-Comment[sl]=Spremenilna tipka (npr. Shift ali Control) je spremenila svoje stanje in je sedaj omogočena
+-Comment[sr]=Модификаторски тастер (нпр. Shift или Control) је променио стање и сада је активан
+-Comment[sr at Latn]=Modifikatorski taster (npr. Shift ili Control) je promenio stanje i sada je aktivan
++Comment[nl]=De status van een modificatietoets (zoals Shift of Control) is gewijzigd en is nu actief
++Comment[pt]=Uma tecla modificadora (p.ex., o Shift ou o Ctrl) mudou o seu estado e ficou activa
++Comment[pt_BR]=Uma tecla modificadora (p.ex., o Shift ou o Ctrl) mudou o seu estado e ficou activa
+ Comment[sv]=En väljartangent (t.ex. Skift eller Ctrl) har ändrat tillstånd och är nu aktiv
+-Comment[tg]=Калиди ислоҳгар (мисоли, Shift ё Control) вазъияти худ иваз кард ва ҳозир фаъол карда шуд
+-Comment[th]=มีการเปลี่ยนสถานะปุ่มสำหรับเปลี่ยนหน้าที่ (เช่น Shift หรือ Control) และขณะนี้ เปิดใช้งาน
+ Comment[uk]=Клавіша-модифікатор (напр., Shift або Control) змінила свій стан і тепер активна
+ Comment[zh_CN]=修饰键(即 Shift 或 Ctrl)更改了其状态,现已激活
+-Comment[zh_TW]=輔助按鍵 (例, Shift 或 Control) 已改變其狀態且目前為作用中
+ default_sound=KDE_Click.wav
+ default_presentation=0
+ nopresentation=236
+@@ -132,6 +113,7 @@
+ Name[af]='n Verandering sleutel was gedeaktiveer
+ Name[bg]=Клавиш модификатор е неактивен
+ Name[ca]=S'ha desactivat una tecla modificadora
++Name[cs]=Modifikační klávesa se stala neaktivní
+ Name[da]=En ændringstast er blevet deaktiveret
+ Name[de]=Eine Sondertaste ist nicht mehr aktiv
+ Name[el]=Απενεργοποιήθηκε ένα πλήκτρο τροποποιητή
+@@ -166,44 +148,24 @@
+ Name[uk]=Клавішу-модифікатор деактивовано
+ Name[zh_CN]=修饰键变为非激活
+ Name[zh_TW]=輔助按鍵已變為非作用中
+-Comment=A modifier key (e.g., Shift or Control) has changed its state and is now inactive
+-Comment[af]='n Verandering sleutel (bv. Shift of Contorl) se status het verander en is nou onaktief
+-Comment[bg]=Клавиш модификатор (Shift или Ctrl) си промени състоянието и е неактивен сега
+-Comment[da]=En ændringstast (f.eks., Shift eller Control) har ændret sin tilstand og er nu inaktiv
+-Comment[de]=Eine Sondertaste (z. B. Umschalt + Strg) hat ihren Status geändert und ist jetzt inaktiv
++Comment=A modifier key (e.g. Shift or Ctrl) has changed its state and is now inactive
++Comment[cs]=Modifikační kláves (např. Shift nebo Control) změnila svůj stav a je nyní neaktivní.
++Comment[da]=En ændringstast (f.eks., Shift eller Ctrl) har ændret sin tilstand og er nu inaktiv
+ Comment[el]=Άλλαξε η κατάσταση ενός πλήκτρου τροποποιητή (π.χ. Shift ή Control) και τώρα είναι ανενεργό
+-Comment[en_GB]=A modifier key (e.g. Shift or Ctrl) has changed its state and is now inactive
+ Comment[es]=Una tecla modificadora (p.ej. Mayúsculas o Control) ha cambiado su estado y ahora está inactiva
+-Comment[et]=Muuteklahv (nt. Shift või Control) muutis oma olekut ning on nüüd mitteaktiivne
+-Comment[eu]=Tekla aldatzaile bat (hau da, Shift edo Kontrol) egoeraz aldatu da eta orain ez da aktiboa
+-Comment[fi]=Muunnosnäppäin (esim. Shift tai Ctrl) on vaihtanut tilaa eikä ole enää aktiivinen
++Comment[et]=Muuteklahv (nt. Shift või Ctrl) muutis oma olekut ning on nüüd mitteaktiivne
+ Comment[fr]=L'état d'une touche de modification (ex : Maj ou Ctrl.) est modifié et elle est maintenant inactive.
+-Comment[fy]=De tastân fan in modifikaasjetoets (sa as Shift of Control) is wizige en is no ynaktyf.
+-Comment[gl]=Unha tecla modificadora (ex. Alt ou Control) mudou de estado e agora está inactiva
++Comment[fy]=De tastân fan in modifikaasjetoets (sa as Shift of Control) is feroare en is no ynaktyf.
+ Comment[hu]=Egy módosító billentyű (pl. a Shift vagy a Ctrl) állapota inaktívvá változott
+-Comment[is]=Breytilykill (Shift eða Control) hefur breytt um stöðu og er nú óvirkur
+-Comment[it]=Un tasto modificatore (es. shift o control) ha cambiato stato ed è diventato inattivo
+-Comment[ja]=修飾キー (Shift や Control など) が変更され、状態は現在非アクティブになっています
+-Comment[km]=គ្រាប់​ចុច​កែប្រែ (ឧ. ប្តូរ ឬ បញ្ជា) បាន​ផ្លាស់ប្តូរ​សភាព​របស់វា ហើយ ឥឡូវ​នេះ​អសកម្ម
++Comment[is]=Breytilykill (Shift eða Ctrl) hefur breytt um stöðu og er nú óvirkur
+ Comment[lt]=Klavišo - modifikatoriaus (pvz., Lyg2(Shift) arba Vald(Ctrl)) būsena pakito ir jis dabar - neaktyvus
+-Comment[mk]=Некое копче за модификација (пр. Shift или Control) си ја смени состојбата и сега е неактивно
+-Comment[nb]=En valgtast (f.eks. «Shift» eller «Ctrl») har fått endret status og er ikke mer i bruk 
+-Comment[nds]=En Sünnertast (t.B. Ümschalt oder Strg) hett den Tostand ännert un is nich mehr aktiv
+-Comment[nl]=De status van een modificatietoets (zoals Shift of Control) is gewijzigd en is nu inactief.
+-Comment[pl]=Klawisz modyfikujący (np. Shift lub Control) zmienił stan i jest teraz wyłączony
+-Comment[pt]=Uma tecla modificadora (p.ex., o Shift ou o Control) mudou o seu estado e ficou inactiva
+-Comment[pt_BR]=Uma tecla modificadora  (por exemplo, Shift ou Control) modificou seu estado e agora tornou-se inativa
+-Comment[ru]=Отжата клавиша модификатора (например, Shift или Ctrl)
+-Comment[se]=Válljenboallu (nugo Shift dahje Control) lea rievdadan stáhtusa ja ii leat šat áktiivalaš
+-Comment[sl]=Spremenilna tipka (npr. Shift ali Control) je spremenila svoje stanje in je sedaj oneomogočena
+-Comment[sr]=Модификаторски тастер (нпр. Shift или Control) је променио стање и више није активан
+-Comment[sr at Latn]=Modifikatorski taster (npr. Shift ili Control) je promenio stanje i više nije aktivan
++Comment[nds]=En Sünnertast (t.B. Ümschalt oder Strg) hett den Tostand ännert un is nu inaktiv
++Comment[nl]=De status van een modificatietoets (zoals Shift of Control) is gewijzigd en is nu inactief
++Comment[pt]=Uma tecla modificadora (p.ex., o Shift ou o Ctrl) mudou o seu estado e ficou inactiva
++Comment[pt_BR]=Uma tecla modificadora (p.ex., o Shift ou o Ctrl) mudou o seu estado e ficou inactiva
+ Comment[sv]=En väljartangent (t.ex. Skift eller Ctrl) har ändrat tillstånd och är nu inaktiv
+-Comment[tg]=Калиди ислоҳгар (мисоли, Shift ё Control) вазъияти худ иваз кард ва ҳозирғайри фаъол карда шуд
+-Comment[th]=,มีการเปลี่ยนสถานะปุ่มสำหรับเปลี่ยนหน้าที่ (เช่น Shift หรือ Control) และขณะนี้ ถูกปิดการใช้งาน
+ Comment[uk]=Клавіша-модифікатор (напр., Shift або Control) змінила свій стан і тепер неактивна
+ Comment[zh_CN]=修饰键(即 Shift 或 Ctrl)更改了其状态,现已非激活
+-Comment[zh_TW]=輔助按鍵 (例, Shift 或 Control) 已改變其狀態且目前為非作用中
+ default_sound=KDE_Click.wav
+ default_presentation=0
+ nopresentation=236
+@@ -212,6 +174,7 @@
+ Name=A modifier key has been locked
+ Name[af]='n Verandering sleutel was gesluit
+ Name[bg]=Клавиш модификатор е заключен
++Name[cs]=Modifikační klávesa byla zamčena
+ Name[da]=En ændringstast er blevet låst
+ Name[de]=Eine Sondertaste wurde eingerastet
+ Name[el]=Ένα πλήκτρο τροποποιητή κλειδώθηκε
+@@ -246,44 +209,24 @@
+ Name[uk]=Клавішу-модифікатор заблоковано
+ Name[zh_CN]=修饰键现已锁定
+ Name[zh_TW]=輔助按鍵已經鎖定
+-Comment=A modifier key (e.g., Shift or Control) has been locked and is now active for all of the following keypresses
+-Comment[af]='n Verandering sleutel (bv. Shift of Control) is gesluit en is nou aktief vir al die volgende sleutel ponse
+-Comment[bg]=Клавиш модификатор е заключен и е активен за всички последващи клавиши
+-Comment[da]=En ændringstast (f.eks., Shift eller Control) er blevet låst og er nu aktiv for alle følgende tastetryk
+-Comment[de]=Eine Sondertaste (z. B. Umschalt + Strg) wurde eingerastet und bleibt für alle folgenden Tastendrücke aktiv
+-Comment[el]=Ένα πλήκτρο τροποποιητή (π.χ. Shift ή Control) κλειδώθηκε και τώρα είναι ανενεργό και είναι τώρα ενεργό για τα επόμενα πατήματα πλήκτρων
+-Comment[en_GB]=A modifier key (e.g. Shift or Ctrl) has been locked and is now active for all of the following keypresses
+-Comment[es]=Se ha bloquedo una tecla modificadora (p. ej Mayúsculas o  Control) y ahora está activa para el resto de las operaciones con el teclado
+-Comment[et]=Muuteklahv (nt. Shift või Control) on lukustatud ja on nüüd aktiivne kõikide järgenvate klahvivajutuste jaoks
+-Comment[eu]=Tekla aldatzaile bat (hau da, Shift edo Kontrol) blokeatu da eta orain aktiboa da hurrengo tekla zapaketa guztiendako
+-Comment[fi]=Muunnosnäppäin (esim. Shift tai Ctrl) on lukittu ja on nyt aktiivinen kaikille seuraaville näppäinpainalluksille
++Comment=A modifier key (e.g. Shift or Ctrl) has been locked and is now active for all of the following keypresses
++Comment[cs]=Modifikační klávesa (např. Shift nebo Control) byla zamčena a je nyní aktivní pro všechny následující stisky kláves
++Comment[da]=En ændringstast (f.eks., Shift eller Ctrl) er blevet låst og er nu aktiv for alle følgende tastetryk
++Comment[el]=Ένα πλήκτρο τροποποιητή (π.χ. Shift ή Control) κλειδώθηκε και είναι τώρα ενεργό για τα επόμενα πατήματα πλήκτρων
++Comment[es]=Se ha bloquedo una tecla modificadora (p. ej. Mayúsculas o  Control) y ahora está activa para el resto de las operaciones con el teclado
++Comment[et]=Muuteklahv (nt. Shift või Ctrl) on lukustatud ja on nüüd aktiivne kõikide järgnevate klahvivajutuste jaoks
+ Comment[fr]=Une touche de modification (ex : Maj ou Ctrl.) a été verrouillée et est maintenant active pour toutes les touches suivantes.
+ Comment[fy]=In modifikaasjetoets (sa as Shift of Control) is beskoattele en is no aktyf foar de neikommende toetsoanslaggen
+-Comment[gl]=Unha tecla modificadora (ex. Alt ou Control) foi bloqueada e agora está activa para as seguintes convinazóns
+-Comment[hu]=Egy módosító billentyű (pl. a Shift vagy a Ctrl) zárolódott, és ezután minden billentyűlenyomásnál aktív
+-Comment[is]=Breytilykli (Shift eða Control) hefur verið læst og er nú virkur fyrir eftirfarandi lyklaborðsaðgerðir
+-Comment[it]=Un tasto modificatore (es. shift o control) è stato bloccato ed adesso è attivo per le prossime immissioni
+-Comment[ja]=修飾キー (Shift や Control など) がロックされ、続くキー押下のすべては現在アクティブです
+-Comment[km]= គ្រាប់ចុច​កែប្រែ​មួយ (ឧ. ប្តូរ ឬ បញ្ជា) ត្រូវ​បាន​ចាក់សោ ហើយ ឥឡូវ​វាសកម្ម​សម្រាប់​ការសង្កត់​គ្រាប់ចុច​ខាងក្រោម​ទាំងអស់​ ។
++Comment[hu]=Egy módosító billentyű (pl. a Shift vagy a Ctrl) zárolódott, és ezután minden billentyűlenyomásnál aktív lesz
++Comment[is]=Breytilykli (Shift eða Ctrl) hefur verið læst og er nú virkur fyrir eftirfarandi lyklaborðsaðgerðir
+ Comment[lt]=Klavišas - modifikatorius (pvz., Lyg2(Shift) arba Vald(Ctrl)) buvo užrakintas ir dabar visiems ateinantiems klavišų paspaudimams yra aktyvus
+-Comment[mk]=Некое копче за модификација (пр. Shift или Control) беше заклучено и сега е активно за сите наредни притиснати копчиња
+-Comment[nb]=En valgtast (f.eks. «Shift» eller «Ctrl») er blitt låst og er nå tilgjengelig for alle de følgende tastetrykkene
+-Comment[nds]=En Sünnertast (t.B. Ümschalt oder Strg) wöör fastsett un warkt nu för dat Drücken vun all nakamen Tasten
++Comment[nds]=En Sünnertast (t.B. Ümschalt oder Strg) wöör fastsett un is nu aktiv för dat Drücken vun all nakamen Tasten
+ Comment[nl]=Een modificatietoets (zoals Shift of Control) is vergrendeld en is nu actief voor de volgende toetsaanslagen
+-Comment[pl]=Klawisz modyfikujący (np. Shift lub Control) został zablokowany i będzie włączony przy następnych naciśnięciach klawiszy
+-Comment[pt]=Uma tecla modificadora (p.ex., o Shift ou o Control) ficou bloqueada e está agora activa para todas as sequências de teclas seguintes
+-Comment[pt_BR]=Uma tecla modificadora  (por exemplo, Shift ou Control) foi bloqueada e agora está ativa para todas as seguintes teclas pressionadas
+-Comment[ru]=Модификатор (например, Shift или Ctrl) зафиксирован и активен для нажатии любых других клавиш
+-Comment[se]=Válljenboallu (nugo Shift dahje Control) lea dál lohkaduvvon ja lea dál aktiivalaš buot boahtevaš boallodeaddilemiid várás
+-Comment[sl]=Spremenilna tipka (npr. Shift ali Control) je zaklenjena in je sedaj omogočena za vse tipkanje v nadaljnje
+-Comment[sr]=Модификаторски тастер (нпр. Shift или Control) је закључан и сада је активан за све наредне притиске тастера
+-Comment[sr at Latn]=Modifikatorski taster (npr. Shift ili Control) je zaključan i sada je aktivan za sve naredne pritiske tastera
++Comment[pt]=Uma tecla modificadora (p.ex., o Shift ou o Ctrl) ficou bloqueada e está agora activa para todas as sequências de teclas seguintes
++Comment[pt_BR]=Uma tecla modificadora (p.ex., o Shift ou o Ctrl) ficou bloqueada e está agora activa para todas as sequências de teclas seguintes
+ Comment[sv]=En väljartangent (t.ex. Skift eller Ctrl) har låsts och är nu aktiv för alla följande tangentnertryckningar
+-Comment[tg]=Калиди ислоҳгар (мисоли, Shift ё Control) қулф карда буд лекин ҳозир ин фаъол аст барои ҳамаи пахшзаданиҳои оянда
+-Comment[th]=ปุ่มสำหรับเปลี่ยนหน้าที่ (เช่น Shift หรือ Control) ค้างอยู่ และขณะนี้จะถูกใช้งาน สำหรับการกดคีย์อื่นๆ ต่อจากนี้ทั้งหมด
+ Comment[uk]=Клавіша-модифікатор (напр., Shift або Control) була заблокована і тепер активна для всіх наступних натискань клавіш
+ Comment[zh_CN]=修饰键(即 Shift 或 Ctrl)已被锁定,现在将适用于后续按键
+-Comment[zh_TW]=輔助按鍵 (例, Shift 或 Control) 已經鎖定且目前對所有下列按下按鍵的動作為作用中
+ default_sound=KDE_Click.wav
+ default_presentation=0
+ nopresentation=236
+@@ -292,6 +235,7 @@
+ Name=A lock key has been activated
+ Name[af]='n Sluit sleutel was geaktiveer
+ Name[bg]=Заключващ клавиш бе активиран
++Name[cs]=Klávesa zámku byla aktivována
+ Name[da]=En låsetast er blevet aktiveret
+ Name[de]=Eine Feststelltaste wurde aktiviert
+ Name[el]=Ένα πλήκτρο τροποποιητή ξεκλειδώθηκε
+@@ -326,44 +270,24 @@
+ Name[uk]=Клавішу блокування активовано
+ Name[zh_CN]=锁定键现已激活
+ Name[zh_TW]=鎖定鍵已作用
+-Comment=A lock key (e.g., Caps Lock or Num Lock) has changed its state and and is now active
+-Comment[af]='n Sluit sleutel (bv. Caps Lock of Num Lock) se toestand het verander en is nou aktief
+-Comment[bg]=Заключващ клавиш (Caps Lock или Num Lock) си промени състоянието и е активен сега
++Comment=A lock key (e.g. Caps Lock or Num Lock) has changed its state and is now active
++Comment[cs]=Klávesa zámku (např. Caps Lock nebo Num Lock) změnila svůj stav a je nyní aktivní
+ Comment[da]=En låsetast (f.eks., Caps Lock eller Num Lock) har ændret sin tilstand og er nu aktiv
+-Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren Status geändert und ist nun aktiv
+-Comment[el]=Ένα πλήκτρο κλειδώματος (π.χ. Caps Lock ή Num Lock) άλλαξε κατάσταση και είναι τώρα ενεργό
+-Comment[en_GB]=A lock key (e.g., Caps Lock or Num Lock) has changed its state and is now active
+-Comment[es]=Una tecla de bloqueo (e.g., Bloq Mayús o Bloq Num) ha cambiado su estado y ahora está activa
+-Comment[et]=Lukustusklahv (nt. Caps Lock või Num Lock) muutis oma seisundit ning on nüüd aktiivne
+-Comment[eu]=Tekla blokeatzaile bat (hau da, blok. maius. edo blok. zenb.) egoeraz aldatu da eta orain aktiboa da
+-Comment[fi]=Lukitusnäppäin (esim. CapsLock tai NumLock) on vaihtanut tilaansa ja on nyt aktiivinen
+-Comment[fr]=L'état d'une touche de verrouillage (ex : Verr. Maj ou Verr. Num.) est modifié et elle est maintenant active.
+-Comment[fy]=De tastân fan in beskoatteltoets (sa as kaptaalskoattel of Nûm skoattel) is wizige en is no aktyf.
+-Comment[gl]=Unha tecla de bloqueo (ex., Bloq Maius ou Bloq Num) mudou de estado e agora está activa
++Comment[el]=Ένα πλήκτρο κλειδώματος (π.χ. Caps Lock ή Num Lock) άλλαξε κατάσταση και είναι τώρα ανενεργό
++Comment[es]=Una tecla de bloqueo (p. ej., Bloq Mayús o Bloq Num) ha cambiado su estado y ahora está inactiva
++Comment[et]=Lukustusklahv (nt. Caps Lock või Num Lock) muutis oma seisundit ning on nüüd mitteaktiivne
++Comment[fr]=L'état d'une touche de verrouillage (ex : Verr. Maj ou Verr. Num.) est modifié et elle est maintenant inactive.
++Comment[fy]=De tastân fan in beskoatteltoets (sa as kaptaalskoattel of Nûm skoattel) is wizige en is no ynaktyf.
+ Comment[hu]=Egy zároló billentyű (pl. a Caps Lock vagy a Num Lock) állapota aktívvá vált
+ Comment[is]=Læsilykill (Caps Lock eða Num Lock) hefur breytt um stöðu og er nú virkur
+-Comment[it]=Un tasto di blocco (es. bloc maiusc o bloc num) ha cambiato stato ed adesso è attivo
+-Comment[ja]=ロックキー (Caps Lock や Num Lock など) が変更され、状態は現在アクティブになっています
+-Comment[km]=គ្រាប់​ចុច​ចាក់សោ (ឧ. ប្តូរ​ជាប់ ឬ Num Lock) បាន​ផ្លាស់ប្តូរ​សភាព​របស់​វា ហើយ ឥឡូវ​នេះ​វា​សកម្ម
+ Comment[lt]=Užrakto klavišo (pvz., Didž(Caps Lock) arba Sk(Num Lock)) būsena pakito ir jis dabar - aktyvus
+-Comment[mk]=Некое копче за заклучување (пр. Caps Lock или Num Lock) си ја смени состојбата и сега е активно
+-Comment[nb]=En låsetast (f.eks. «Caps Lock» eller «Num Lock») har fått endret statusen og er nå tatt i bruk
+-Comment[nds]=En Faststelltast (t.B. Grootschriev- oder Tallenümschalttast) hett den Tostand ännert un is nu aktiv.
+-Comment[nl]=De status van een vergrendeltoets (zoals Caps Lock of Num Lock) is gewijzigd en is nu actief.
+-Comment[pl]=Klawisz blokujący (np. Caps Lock lub Num Lock) zmienił stan i jest teraz włączony
++Comment[nds]=En Faststelltast (t.B. Grootschriev- oder Tallenümschalttast) hett den Tostand ännert un is nu aktiv
++Comment[nl]=De status van een vergrendeltoets (zoals Caps Lock of Num Lock) is gewijzigd en is nu inactief
+ Comment[pt]=Uma tecla de bloqueio (p.ex., o Caps Lock ou o Num Lock) mudou o seu estado e ficou activa
+-Comment[pt_BR]=Uma tecla de bloqueio  (por exemplo, Caps Lock ou Num Block) teve seu estado modificado e agora está ativa
+-Comment[ru]=Нажата клавиша переключения режимов (Caps Lock или Num Lock)
+-Comment[se]=Lohkadanboallu (nugo Caps Lock dahje Num Lock) lea rievdadan stáhtusa ja lea dál aktiivalaš
+-Comment[sl]=Zaklenilna tipka (npr Caps Lock ali Num Lock) je spremenila svoje stanje in je sedaj omogočena
+-Comment[sr]=Тастер за закључавање (нпр. Caps Lock или Num Lock) је променио стање и сада је активан
+-Comment[sr at Latn]=Taster za zaključavanje (npr. Caps Lock ili Num Lock) je promenio stanje i sada je aktivan
++Comment[pt_BR]=Uma tecla de bloqueio (p.ex., o Caps Lock ou o Num Lock) mudou o seu estado e ficou activa
+ Comment[sv]=En låstangent (t.ex. Caps Lock eller Num Lock) har ändrat tillstånd och är nu aktiv
+-Comment[tg]=Калиди қулф (мисоли, Caps Lock ё Num Lock) вазъияти худ иваз кард ва ҳозир фаъол карда шуд
+-Comment[th]=มีการเปลี่ยนสถานะปุ่มล็อค (เช่น Caps Lock หรือ Num Lock) และขณะนี้ ถูกเปิดใช้งาน
+ Comment[uk]=Клавіша блокування (напр., Caps Lock або Num Lock) змінила свій стан і тепер активна
+-Comment[zh_CN]=锁定键(如 Caps Lock 或 Num Lock)更改了其状态,现已激活
+-Comment[zh_TW]=鎖定按鍵 (例, Caps Lock 或 Num Lock) 已改變其狀態且目前為作用中
++Comment[zh_CN]=锁定键(如 Caps Lock 或 Num Lock)更改了其状态,现已非激活
+ default_sound=KDE_Click.wav
+ default_presentation=0
+ nopresentation=236
+@@ -372,6 +296,7 @@
+ Name=A lock key has been deactivated
+ Name[af]='n Sluit sleutel was gedeaktiveer
+ Name[bg]=Заключващ клавиш бе деактивиран
++Name[cs]=Klávesa zámku byla deaktivována
+ Name[da]=En låsetast er blevet deaktiveret
+ Name[de]=Eine Feststelltaste wurde deaktiviert
+ Name[el]=Ένα πλήκτρο κλειδώματος απενεργοποιήθηκε
+@@ -406,44 +331,24 @@
+ Name[uk]=Клавішу блокування деактивовано
+ Name[zh_CN]=锁定键现已非激活
+ Name[zh_TW]=鎖定鍵已取消作用
+-Comment=A lock key (e.g., Caps Lock or Num Lock) has changed its state and is now inactive
+-Comment[af]='n Sluit sleutel (bv. Caps Lock of Num Lock) se toestand het verander en is nou onaktief
+-Comment[bg]=Заключващ клавиш (Caps Lock или Num Lock) си промени състоянието и е неактивен сега
++Comment=A lock key (e.g. Caps Lock or Num Lock) has changed its state and is now inactive
++Comment[cs]=Klávesa zámku (např. Caps Lock nebo Num Lock) změnila svůj stav a je nyní aktivní
+ Comment[da]=En låsetast (f.eks., Caps Lock eller Num Lock) har ændret sin tilstand og er nu inaktiv
+-Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren Status geändert und ist nun inaktiv
+ Comment[el]=Ένα πλήκτρο κλειδώματος (π.χ. Caps Lock ή Num Lock) άλλαξε κατάσταση και είναι τώρα ανενεργό
+-Comment[en_GB]=A lock key (e.g. Caps Lock or Num Lock) has changed its state and is now inactive
+-Comment[es]=Una tecla de bloqueo (e.g., Bloq Mayús o Bloq Num) ha cambiado su estado y ahora está inactiva
++Comment[es]=Una tecla de bloqueo (p. ej., Bloq Mayús o Bloq Num) ha cambiado su estado y ahora está inactiva
+ Comment[et]=Lukustusklahv (nt. Caps Lock või Num Lock) muutis oma seisundit ning on nüüd mitteaktiivne
+-Comment[eu]=Tekla blokeatzaile bat (hau da, blok. maius. edo blok. zenb.) egoeraz aldatu da eta orain ez da aktiboa
+-Comment[fi]=Lukitusnäppäin (esim. CapsLock tai NumLock) on vaihtanut tilaansa ja ei ole enää aktiivinen
+ Comment[fr]=L'état d'une touche de verrouillage (ex : Verr. Maj ou Verr. Num.) est modifié et elle est maintenant inactive.
+ Comment[fy]=De tastân fan in beskoatteltoets (sa as kaptaalskoattel of Nûm skoattel) is wizige en is no ynaktyf.
+-Comment[gl]=Unha tecla de bloqueo (ex., Bloq Maius ou Bloq Num) mudou de estado e agora está inactiva
+ Comment[hu]=Egy zároló billentyű (pl. a Caps Lock vagy a Num Lock) állapota inaktívvá vált
+ Comment[is]=Læsilykill (Caps Lock eða Num Lock) hefur breytt um stöðu og er nú óvirkur
+-Comment[it]=Un tasto di blocco (es. bloc maiusc o bloc num) ha cambiato stato ed adesso è inattivo
+-Comment[ja]=ロックキー (Caps Lock や Num Lock など) が変更され、状態は現在非アクティブになっています
+-Comment[km]=គ្រាប់​ចុច​ចាក់សោ (ឧ. ប្តូរ​ជាប់ ឬ Num Lock) បាន​ផ្លាស់ប្តូរ​សភាព​របស់​វា ហើយ ឥឡូវ​នេះ​វាអសកម្ម
+ Comment[lt]=Užrakto klavišo (pvz., Didž(Caps Lock) arba Sk(Num Lock)) būsena pakito ir jis dabar - neaktyvus
+-Comment[mk]=Некое копче за заклучување (пр. Caps Lock или Num Lock) си ја смени состојбата и сега е неактивно
+-Comment[nb]=En låsetast (f.eks. «Caps Lock» eller «Num lock») har endret statusen og er nå skrudd av.
+-Comment[nds]=En Faststelltast (t.B. Grootschriev- oder Tallenümschalttast) hett den Tostand ännert un is nich mehr aktiv
+-Comment[nl]=De status van een vergrendeltoets (zoals Caps Lock of Num Lock) is gewijzigd en is nu inactief.
+-Comment[pl]=Klawisz blokujący (np. Caps Lock lub Num Lock) zmienił stan i jest teraz wyłączony
++Comment[nds]=En Faststelltast (t.B. Grootschriev- oder Tallenümschalttast) hett den Tostand ännert un is nu inaktiv
++Comment[nl]=De status van een vergrendeltoets (zoals Caps Lock of Num Lock) is gewijzigd en is nu inactief
+ Comment[pt]=Uma tecla de bloqueio (p.ex., o Caps Lock ou o Num Lock) mudou o seu estado e ficou inactiva
+-Comment[pt_BR]=Uma tecla de bloqueio  (por exemplo, Caps Lock ou Num Lock) teve seu estado modificado e agora está inativa
+-Comment[ru]=Отжата клавиша переключения режимов (Caps Lock или Num Lock)
+-Comment[se]=Lohkadanboallu (nugo Caps Lock dahje Num Lock) lea rievdadan stáhtusa ja ii leat šat aktiivalaš
+-Comment[sl]=Zaklenilna tipka (npr Caps Lock ali Num Lock) je spremenila svoje stanje in je sedaj onemogočena
+-Comment[sr]=Тастер за закључавање (нпр. Caps Lock или Num Lock) је променио стање и нише није активан
+-Comment[sr at Latn]=Taster za zaključavanje (npr. Caps Lock ili Num Lock) je promenio stanje i niše nije aktivan
++Comment[pt_BR]=Uma tecla de bloqueio (p.ex., o Caps Lock ou o Num Lock) mudou o seu estado e ficou inactiva
+ Comment[sv]=En låstangent (t.ex. Caps Lock eller Num Lock) har ändrat tillstånd och är nu inaktiv
+-Comment[tg]=калиди қулф (мисоли, Caps Lock ё Num Lock) вазъияти худ иваз кард ва ҳозир ғайри фаъол карда шуд
+-Comment[th]=มีการเปลี่ยนสถานะปุ่มล็อค (เช่น Caps Lock หรือ Num Lock) และขณะนี้ปิดการใช้งาน
+ Comment[uk]=Клавіша блокування (напр., Caps Lock або Num Lock) змінила свій стан і тепер неактивна
+ Comment[zh_CN]=锁定键(如 Caps Lock 或 Num Lock)更改了其状态,现已非激活
+-Comment[zh_TW]=鎖定按鍵 (例, Caps Lock 或 Num Lock) 已改變其狀態且目前為非作用中
+ default_sound=KDE_Click.wav
+ default_presentation=0
+ nopresentation=236
+--- kcontrol/access/kaccess.cpp	(revision 488815)
++++ kcontrol/access/kaccess.cpp	(revision 494868)
+@@ -45,9 +45,9 @@
+       I18N_NOOP("The Shift key is now active."),
+       I18N_NOOP("The Shift key is now inactive.") },
+     { ControlMask, 0, "Control",
+-      I18N_NOOP("The Control key has been locked and is now active for all of the following keypresses."),
+-      I18N_NOOP("The Control key is now active."),
+-      I18N_NOOP("The Control key is now inactive.") },
++      I18N_NOOP("The Ctrl key has been locked and is now active for all of the following keypresses."),
++      I18N_NOOP("The Ctrl key is now active."),
++      I18N_NOOP("The Ctrl key is now inactive.") },
+     { 0, XK_Alt_L, "Alt",
+       I18N_NOOP("The Alt key has been locked and is now active for all of the following keypresses."),
+       I18N_NOOP("The Alt key is now active."),
+@@ -69,9 +69,9 @@
+       I18N_NOOP("The Hyper key is now active."),
+       I18N_NOOP("The Hyper key is now inactive.") },
+     { 0, 0, "Alt Graph",
+-      I18N_NOOP("The Alt Graph key has been locked and is now active for all of the following keypresses."),
+-      I18N_NOOP("The Alt Graph key is now active."),
+-      I18N_NOOP("The Alt Graph key is now inactive.") },
++      I18N_NOOP("The Alt Gr key has been locked and is now active for all of the following keypresses."),
++      I18N_NOOP("The Alt Gr key is now active."),
++      I18N_NOOP("The Alt Gr key is now inactive.") },
+     { 0, XK_Num_Lock, "Num Lock",
+       I18N_NOOP("The Num Lock key has been activated."),
+       "",
+@@ -787,12 +787,12 @@
+    unsigned int disabled = features & ~requestedFeatures;
+ 
+    if (enabled & XkbSlowKeysMask)
+-      KNotifyClient::event (0, "slowkeys", i18n("Slow keys has been enabled. From now on, you need to press each key a certain time before it gets acceted."));
++      KNotifyClient::event (0, "slowkeys", i18n("Slow keys has been enabled. From now on, you need to press each key for a certain length of time before it is accepted."));
+    else if (disabled & XkbSlowKeysMask)
+       KNotifyClient::event (0, "slowkeys", i18n("Slow keys has been disabled."));
+ 
+    if (enabled & XkbBounceKeysMask)
+-      KNotifyClient::event (0, "bouncekeys", i18n("Bounce keys has been enabled. From now on, each key will be blocked a certain time after it was used."));
++      KNotifyClient::event (0, "bouncekeys", i18n("Bounce keys has been enabled. From now on, each key will be blocked for a certain length of time after it is used."));
+    else if (disabled & XkbBounceKeysMask)
+       KNotifyClient::event (0, "bouncekeys", i18n("Bounce keys has been disabled."));
+ 
+--- kcontrol/access/kcmaccess.cpp	(revision 488815)
++++ kcontrol/access/kcmaccess.cpp	(revision 494868)
+@@ -506,7 +506,7 @@
+ 					  "Sticky keys: Press Shift key 5 consecutive times\n"
+ 					  "Slow keys: Hold down Shift for 8 seconds").arg(shortcut));
+ 
+-  timeout = new QCheckBox(i18n("Turn sticky keys and slow keys off after a certain time of inactivity"), grp);
++  timeout = new QCheckBox(i18n("Turn sticky keys and slow keys off after a certain period of inactivity"), grp);
+   vvbox->addWidget(timeout);
+ 
+   hbox = new QHBoxLayout(vvbox, KDialog::spacingHint());
+@@ -528,7 +528,7 @@
+ 
+   gestureConfirmation = new QCheckBox(i18n("Show a confirmation dialog whenever a keyboard accessibility feature is turned on or off"), grp);
+   vvbox->addWidget(gestureConfirmation);
+-  QWhatsThis::add (gestureConfirmation, i18n("If this option is checked, KDE will show a confirmation dialog whenever a keyboard accessibility feature is turned on or off.\nBe carefull to know what you are doing if you uncheck it as then the keyboard accessibility settings will always be applied without confirmation.") );
++  QWhatsThis::add (gestureConfirmation, i18n("If this option is checked, KDE will show a confirmation dialog whenever a keyboard accessibility feature is turned on or off.\nBe sure you know what you are doing if you uncheck it, as the keyboard accessibility settings will then always be applied without confirmation.") );
+ 
+   kNotifyAccessX = new QCheckBox(i18n("Use KDE's system notification mechanism whenever a keyboard accessibility feature is turned on or off"), grp);
+   vvbox->addWidget(kNotifyAccessX);
+--- kcontrol/smserver/kcmsmserver.desktop	(revision 488815)
++++ kcontrol/smserver/kcmsmserver.desktop	(revision 494868)
+@@ -103,7 +103,7 @@
+ Comment[fa]= می‌توانید مدیر نشست و تنظیمات خروج را اینجا تنظیم کنید
+ Comment[fi]=Istunnonhallinnan ja uloskirjautumisen asetukset
+ Comment[fr]=Configuration du gestionnaire de session et réglages de la sortie
+-Comment[fy]=Hjir kinst it sesjebehear en ôfmeld-ynstellings fêststelle
++Comment[fy]=Hjir kinne jo it sesjebehear en ôfmeld-ynstellings fêststelle
+ Comment[gl]=Configurar o xestor de sesións e as opzóns de saída
+ Comment[he]=שינוי הגדרות מנהל ההפעלה והיציאה מהמערכת
+ Comment[hi]=सत्र प्रबंधक तथा लॉगआउट विन्यास कॉन्फ़िगर करें
+--- kcontrol/konq/desktopbehavior_impl.cpp	(revision 488815)
++++ kcontrol/konq/desktopbehavior_impl.cpp	(revision 494868)
+@@ -43,6 +43,9 @@
+ #include <kipc.h>
+ #include <kprotocolinfo.h>
+ 
++const int customMenu1ID = 5;
++const int customMenu2ID = 6;
++
+ DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, QWidget *parent, const char * )
+     : KCModule( parent, "kcmkonq" )
+ {
+@@ -420,15 +423,13 @@
+ 
+ void DesktopBehavior::comboBoxChanged()
+ {
+-  // 4 - CustomMenu1
+-  // 5 - CustomMenu2
+   int i;
+   i = leftComboBox->currentItem();
+-  leftEditButton->setEnabled((i == 4) || (i == 5));
++  leftEditButton->setEnabled((i == customMenu1ID) || (i == customMenu2ID));
+   i = middleComboBox->currentItem();
+-  middleEditButton->setEnabled((i == 4) || (i == 5));
++  middleEditButton->setEnabled((i == customMenu1ID) || (i == customMenu2ID));
+   i = rightComboBox->currentItem();
+-  rightEditButton->setEnabled((i == 4) || (i == 5));
++  rightEditButton->setEnabled((i == customMenu1ID) || (i == customMenu2ID));
+ }
+ 
+ void DesktopBehavior::editButtonPressed()
+@@ -442,9 +443,9 @@
+       i = rightComboBox->currentItem();
+ 
+    QString cfgFile;
+-   if (i == 4) // CustomMenu1
++   if (i == customMenu1ID)
+       cfgFile = "kdesktop_custom_menu1";
+-   if (i == 5) // CustomMenu2
++   if (i == customMenu2ID)
+       cfgFile = "kdesktop_custom_menu2";
+ 
+    if (cfgFile.isEmpty())
+@@ -469,7 +470,7 @@
+     "for your desktop, including the way in which icons are arranged and\n"
+     "the pop-up menus associated with clicks of the middle and right mouse\n"
+     "buttons on the desktop.\n"
+-    "Use the \"Whats This?\" (Shift+F1) to get help on specific options.");
++    "Use the \"What's This?\" (Shift+F1) to get help on specific options.");
+ }
+ 
+ #include "desktopbehavior_impl.moc"
+--- kcontrol/konq/desktoppath.desktop	(revision 488815)
++++ kcontrol/konq/desktoppath.desktop	(revision 494868)
+@@ -102,7 +102,7 @@
+ Comment[fa]=تغییر محل ذخیره‌ی پرونده‌های مهم
+ Comment[fi]=Tässä kohdassa voit määritellä minne tärkeät tiedostot tallennetaan
+ Comment[fr]=Changer l'endroit où les fichiers importants sont stockés
+-Comment[fy]=Hjir kinne jo de lokaasje fan it opslaan fan belangrike triemen wizigje
++Comment[fy]=Hjir kinne jo de lokaasje fan it bewarjen fan belangrike triemen wizigje
+ Comment[gl]=Cambiar a localizazón onde se guardan os arquivos importantes
+ Comment[he]=שינוי המיקומים בהם מאוחסנים קבצים חשובים
+ Comment[hi]=महत्वपूर्ण फ़ाइलों के रखने का स्थान बदलें
+--- kcontrol/konq/rootopts.cpp	(revision 488815)
++++ kcontrol/konq/rootopts.cpp	(revision 494868)
+@@ -67,7 +67,7 @@
+   setQuickHelp( i18n("<h1>Paths</h1>\n"
+     "This module allows you to choose where in the filesystem the "
+     "files on your desktop should be stored.\n"
+-    "Use the \"Whats This?\" (Shift+F1) to get help on specific options."));
++    "Use the \"What's This?\" (Shift+F1) to get help on specific options."));
+ 
+   // Desktop Paths
+   row++;
+--- kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop	(revision 488815)
++++ kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop	(revision 494868)
+@@ -107,7 +107,7 @@
+ Comment[fa]=نصب و پیش نمایش قلم
+ Comment[fi]=Asenna ja esikatsele kirjasimia
+ Comment[fr]=Pour installer et afficher des polices de caractères
+-Comment[fy]=Lettertypen Ynstallearje en besjen
++Comment[fy]=Lettertypen ynstallearje en besjen
+ Comment[ga]=Suiteáil & Réamhamharc na gClónna
+ Comment[gl]=Instalar e antever fontes
+ Comment[he]=התקנה ותצוגה מקדימה של גופנים
+--- kcontrol/kfontinst/kfontinst/GetPid.c	(revision 488815)
++++ kcontrol/kfontinst/kfontinst/GetPid.c	(revision 494868)
+@@ -21,7 +21,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ //
+ ////////////////////////////////////////////////////////////////////////////////
+ // (C) Craig Drummond, 2003
+--- kcontrol/kfontinst/viewpart/kfontviewpart.desktop	(revision 488815)
++++ kcontrol/kfontinst/viewpart/kfontviewpart.desktop	(revision 494868)
+@@ -19,7 +19,7 @@
+ Name[et]=Fontide vaataja
+ Name[eu]=Letra-tipo ikustailea
+ Name[fa]=نمایشگر قلم
+-Name[fi]=Kirjasinnäytin
++Name[fi]=Kirjasinten näytin
+ Name[fr]=Afficheur de polices
+ Name[fy]=Lettertypewerjefteprogramma
+ Name[ga]=Amharcán Clófhoirne
+--- kcontrol/kio/main.cpp	(revision 488815)
++++ kcontrol/kio/main.cpp	(revision 494868)
+@@ -98,14 +98,14 @@
+ 		"can be found at <a href=\"http://lisa-home.sourceforge.net\">"
+ 		"the LISa Homepage</a> or contact Alexander Neundorf "
+ 		"&lt;<a href=\"mailto:neundorf at kde.org\">neundorf at kde.org</a>&gt;."));
+-   
++
+    layout.addWidget(&tabs);
+ 
+    smbPage = create_smb(&tabs, 0);
+    tabs.addTab(smbPage, i18n("&Windows Shares"));
+    connect(smbPage,SIGNAL(changed(bool)), SLOT( changed() ));
+ 
+-   lisaPage = KCModuleLoader::loadModule("kcmlisa", &tabs);
++   lisaPage = KCModuleLoader::loadModule("kcmlisa", KCModuleLoader::Both, &tabs);
+    if (lisaPage)
+    {
+      tabs.addTab(lisaPage,i18n("&LISa Daemon"));
+@@ -119,7 +119,7 @@
+ //     connect(resLisaPage,SIGNAL(changed()), SLOT( changed() ));
+ //   }
+ 
+-   kioLanPage = KCModuleLoader::loadModule("kcmkiolan", &tabs);
++   kioLanPage = KCModuleLoader::loadModule("kcmkiolan",  KCModuleLoader::Both, &tabs);
+    if (kioLanPage)
+    {
+      tabs.addTab(kioLanPage,i18n("lan:/ Iosla&ve"));
+--- kcontrol/kio/useragent.desktop	(revision 488815)
++++ kcontrol/kio/useragent.desktop	(revision 494868)
+@@ -31,7 +31,7 @@
+ Name[fa]=شناسایی مرورگر
+ Name[fi]=Selaimen tunnistus
+ Name[fr]=Identification du navigateur
+-Name[fy]=Blêdzjer identifikaasje
++Name[fy]=Blêder identifikaasje
+ Name[ga]=Aitheantas Brabhsálaithe
+ Name[gl]=Identificazón do Navegador
+ Name[he]=זיהוי דפדפן
+@@ -45,7 +45,7 @@
+ Name[lo]=ການແຈ້ງເຕືອນ
+ Name[lt]=Naršyklės identifikacija
+ Name[lv]=Pārlūka identifikācija
+-Name[mk]=Идентификација на прелистувачот
++Name[mk]=Идентификација на\nпрелистувач
+ Name[mn]=Хөтөч-Тодотгол
+ Name[mt]=Identifikazzjoni tal-browser
+ Name[nb]=Nettleseridentifisering
+@@ -99,7 +99,7 @@
+ Comment[fa]=تنظیم نوع گزارش دادن کانکرر 
+ Comment[fi]=Vaihda Konquerorin esittäytymistapaa
+ Comment[fr]=Configuration de la manière dont Konqueror se signale
+-Comment[fy]=Hjir kinne jo fêststelle hoe Konqueror him by webtsjinners identifisearret
++Comment[fy]=Hjir kinne jo fêststelle hoe Konqueror har by webtsjinners identifisearret
+ Comment[gl]=Configurar o xeito en que Konqueror informa sobre si mesmo
+ Comment[he]=שינוי הדרך שבה Konqueror מזדהה
+ Comment[hi]=कॉन्करर अपने आप को जिस रूप में रिपोर्ट करे वैसा कॉन्फ़िगर करें
+--- kcontrol/kio/cache.desktop	(revision 488815)
++++ kcontrol/kio/cache.desktop	(revision 494868)
+@@ -25,7 +25,7 @@
+ Name[eu]=Katxea
+ Name[fa]=کاشه
+ Name[fi]=Välimuisti
+-Name[fy]=Lyts Unthâld
++Name[fy]=Lyts ûnthâld
+ Name[ga]=Taisce
+ Name[gl]=Caché
+ Name[he]=מטמון
+--- kcontrol/kio/uasproviders/safari.desktop	(revision 488815)
++++ kcontrol/kio/uasproviders/safari.desktop	(revision 494868)
+@@ -57,3 +57,4 @@
+ X-KDE-UA-VERSION=1.2.4
+ X-KDE-UA-SYSNAME=Mac OS
+ X-KDE-UA-SYSRELEASE=X
++X-KDE-UA-DYNAMIC-ENTRY=1
+--- kcontrol/clock/tzone.cpp	(revision 488815)
++++ kcontrol/clock/tzone.cpp	(revision 494868)
+@@ -97,6 +97,10 @@
+         tf.setAutoDelete( true );
+         QTextStream *ts = tf.textStream();
+ 
++# ifndef INITFILE
++#  define INITFILE	"/etc/default/init"
++# endif
++
+         QFile fTimezoneFile(INITFILE);
+         bool updatedFile = false;
+ 
+--- kcontrol/view1394/view1394.h	(revision 488815)
++++ kcontrol/view1394/view1394.h	(revision 494868)
+@@ -15,7 +15,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #ifndef VIEW1394_H_
+--- kcontrol/view1394/view1394.cpp	(revision 488815)
++++ kcontrol/view1394/view1394.cpp	(revision 494868)
+@@ -15,7 +15,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #include <qlayout.h>
+--- kcontrol/view1394/kcmview1394.desktop	(revision 488815)
++++ kcontrol/view1394/kcmview1394.desktop	(revision 494868)
+@@ -92,7 +92,7 @@
+ Comment[fa]=نمایش دستگاه‌های USB متصل به این سیستم
+ Comment[fi]=Näyttää tietokoneeseen liitetyt IEEE 1394 (Firewire)-laitteet
+ Comment[fr]=Affiche les périphériques IEEE 1394 rattachés à cet ordinateur
+-Comment[fy]=Hjir kinst de IEEE 1394-apparaten besjen die op dizze kompjûter oansluten binne
++Comment[fy]=Hjir kinne jo de IEEE 1394-apparaten besjen die op dizze kompjûter oansluten binne
+ Comment[ga]=Taispeáin na gléasanna IEEE 1394 ceangailte leis an ríomhaire seo
+ Comment[gl]=Ver os dispositivos IEEE 1394 conectados a este computador
+ Comment[he]=צפה בהתקני IEEE 1394 המחוברים למחשב זה
+--- kcontrol/konqhtml/khtml_fonts.desktop	(revision 488815)
++++ kcontrol/konqhtml/khtml_fonts.desktop	(revision 494868)
+@@ -100,7 +100,7 @@
+ Comment[fa]= تنظیم قلم‌های لازم براب نمایش صفحات وب
+ Comment[fi]=WWW-sivujen kirjasimet
+ Comment[fr]=Configuration des polices utilisées sur les pages web
+-Comment[fy]=Hjir kinnejo de lettertypen die brûkt wurde op de websiden ynstelle
++Comment[fy]=Hjir kinne jo de lettertypen die brûkt wurde op de websiden ynstelle
+ Comment[gl]=Configurar as fontes empregadas nas páxinas web
+ Comment[he]=שינוי הגדרות הגופנים שנעשה בהם שימוש בדפי אינטרנט
+ Comment[hi]=वेब पृष्ठ पर उपयोग में आने वाले फ़ॉन्ट्स कॉन्फ़िगर करें
+@@ -164,7 +164,7 @@
+ Keywords[fa]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding, کانکرر,قلم,مجموعه‌نویسه
+ Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,merkistöt,koodaus
+ Keywords[fr]=konqueror,kfm,navigateur,html,web,www,polices,couleurs,java,javascript,curseur,liens,images,jeu de caractères,caractères,codage,encodage
+-Keywords[fy]=konqueror,kfm,browser,blêdzjer,html,web,www,fonts,lettertypen,tekensets,karaktersamling,kodearring,ynternet
++Keywords[fy]=konqueror,kfm,browser,blêder,html,web,www,fonts,lettertypen,tekensets,karaktersamling,kodearring,ynternet
+ Keywords[ga]=konqueror,kfm,brabhsálaí,html,gréasán,www,clónna,clófhoirne,tacair charachtair,ionchódú
+ Keywords[gl]=konqueror,kfm,navegador,html,web,www,fontes,carácteres,conxunto de carácteres,codificazón
+ Keywords[he]=konqueror,kfm,דפדפן,html,web,www,אינטרנט,browser,web,fonts,charsets,character sets,encoding, גופנים,מערכי תווים,קידוד
+--- kcontrol/konqhtml/khtml_java_js.desktop	(revision 488815)
++++ kcontrol/konqhtml/khtml_java_js.desktop	(revision 494868)
+@@ -147,7 +147,7 @@
+ Keywords[fa]=konqueror,kfm,browser,html,web,www,java,javascript,جاوا,جاواسکریپت,کانکرر,مرورگر,وب
+ Keywords[fi]=konqueror,kfm,selain,html,web,www,java,javascript
+ Keywords[fr]=konqueror,kfm,navigateur,html,web,www,polices,couleurs,java,javascript,curseur,liens,images,jeu de caractères,caractères,codage,encodage
+-Keywords[fy]=konqueror,kfm,browser,blêdzjer,html,web,www,java,javaskript,ynternet
++Keywords[fy]=konqueror,kfm,browser,blêder,html,web,www,java,javaskript,ynternet
+ Keywords[ga]=konqueror,kfm,brabhsálaí,html,gréasán,www,java,javascript
+ Keywords[gl]=konqueror,kfm,navegador,html,web,www,java,javascript
+ Keywords[he]=konqueror,kfm,דפדפן,html,אינטרנט,www,java,javascript,ג'אווה, browser,web,www,java,javascript
+--- kcontrol/style/style.desktop	(revision 488815)
++++ kcontrol/style/style.desktop	(revision 494868)
+@@ -105,7 +105,7 @@
+ Comment[fa]= توانایی تغییر و اصلاح نوع رفتار تکه‌ها و سبک KDE را به شما می‌دهد
+ Comment[fi]=Mahdollistaa kontrollien käyttäytymisen muokaamisen ja KDE:n tyylin vaihtamisen
+ Comment[fr]=Permet la configuration du comportement des éléments graphiques et la modification des styles de KDE
+-Comment[fy]=Hjirmei kinst it gedrach fan de widgets oanpasse en de styl fan KDE wizigje
++Comment[fy]=Hjirmei kinne jo it gedrach fan de widgets oanpasse en de styl fan KDE wizigje
+ Comment[gl]=Permite a manipulazón do comportamento dun widget e o cámbio de estilo de KDE
+ Comment[he]=שינוי הגדרות פעולת הפריטים והסגנון של KDE
+ Comment[hi]=केडीई की शैली तथा विजेट बर्ताव में परिवर्तन की स्वीकृति देता है
+--- kcontrol/performance/kcmperformance.desktop	(revision 488815)
++++ kcontrol/performance/kcmperformance.desktop	(revision 494868)
+@@ -92,7 +92,7 @@
+ Comment[fa]=تنظیماتی که می‌توانند عملکرد KDE را بهبود بخشند تنظیم کنید
+ Comment[fi]=Muokkaa KDE:n suorituskykyyn liittyviä asetuksia
+ Comment[fr]=Configuration de paramètres qui peuvent améliorer les performances de KDE
+-Comment[fy]=Hjir kinst ynstellings kiezen die de prestaasjees fan KDE kinne ferbetterje
++Comment[fy]=Hjir kinne jo ynstellings kiezen die de prestaasje fan KDE kinne ferbetterje
+ Comment[ga]=Cumraigh socruithe a chuirfidh feabhas ar fheidhmiúchán KDE
+ Comment[gl]=Configurazón das opzóns que poden mellorar o rendimento de KDE
+ Comment[he]=הגדר הגדרות שעשויות לשפר את ביצועי KDE
+--- kcontrol/performance/kcmkonqyperformance.desktop	(revision 488815)
++++ kcontrol/performance/kcmkonqyperformance.desktop	(revision 494868)
+@@ -90,7 +90,7 @@
+ Comment[fa]=تنظیماتی که می‌توانند عملکرد کانکرر را بهبود بخشند تنظیم کنید
+ Comment[fi]=Muokkaa Konquerorin suorituskykyyn liittyviä asetuksia
+ Comment[fr]=Amélioration des performances de Konqueror
+-Comment[fy]=Hjir kinst ynstellings kieze die de prestaasjes fan Konqueror ferbetterje
++Comment[fy]=Hjir kinne jo ynstellings kieze die de prestaasje fan Konqueror ferbetterje
+ Comment[ga]=Cumraigh socruithe a chuirfidh feabhas ar fheidhmiúchán Konqueror
+ Comment[gl]=Configurar as opzóns que poden mellorar o rendimento de Konqueror
+ Comment[he]=הגדר הגדרות העשויות לשפר את ביצועי Konqueror
+--- kcontrol/performance/system_ui.ui	(revision 488815)
++++ kcontrol/performance/system_ui.ui	(revision 494868)
+@@ -40,7 +40,7 @@
+                         <cstring>label_kbuildsycoca</cstring>
+                     </property>
+                     <property name="text">
+-                        <string>&lt;b&gt;WARNING:&lt;/b&gt; This option may in rare cases lead to various problems. Consult the What's This (Shift+F1) help for details.</string>
++                        <string>&lt;b&gt;WARNING:&lt;/b&gt; This option may in rare cases lead to various problems. Consult the What's This? (Shift+F1) help for details.</string>
+                     </property>
+                 </widget>
+             </vbox>
+--- kcontrol/xinerama/xinerama.desktop	(revision 488815)
++++ kcontrol/xinerama/xinerama.desktop	(revision 494868)
+@@ -89,7 +89,7 @@
+ Comment[fa]=تنظیم KDE برای نمایشگرهای متعدد
+ Comment[fi]=Muokkaa KDE sopivaksi usealle näytölle
+ Comment[fr]=Configuration de KDE pour l'utilisation de moniteurs multiples
+-Comment[fy]=Hjir kinst KDE foar meardere monitors ynstelle
++Comment[fy]=Hjir kinne jo KDE foar meardere monitors ynstelle
+ Comment[gl]=Configurar KDE para múltiplos monitores
+ Comment[he]=הגדר את KDE לשימוש במספר מסכים
+ Comment[hi]=अनेक मॉनीटर्स के लिए केडीई कॉन्फ़िगर करें
+--- kcontrol/randr/krandrtray.desktop	(revision 488815)
++++ kcontrol/randr/krandrtray.desktop	(revision 494868)
+@@ -67,7 +67,7 @@
+ Comment[eu]=Aldatu tamaina eta biratu zure X pantailak.
+ Comment[fi]=Näytön kuvan koon muuttaminen ja kuvan kääntäminen
+ Comment[fr]=Redimensionner et retourner votre affichage.
+-Comment[fy]=skermgrutte wizigje en rotearje X skermen
++Comment[fy]=Skermgrutte wizigje en rotearje X skermen
+ Comment[ga]=Athraigh an méid agus rothlaigh scáileáin X.
+ Comment[gl]=Redimensionar e rotar pantallas
+ Comment[he]=שנה את גודלה של התצוגה שלך וסובב אותה.
+--- kcontrol/kthememanager/kthememanager.desktop	(revision 488815)
++++ kcontrol/kthememanager/kthememanager.desktop	(revision 494868)
+@@ -18,7 +18,7 @@
+ Comment[eu]=Kudeatu KDEren gai bisual orokorrak
+ Comment[fi]=Ylläpidä KDE:n teemoja
+ Comment[fr]=Gestionnaire de thèmes visuels globaux de KDE
+-Comment[fy]=Algemiene visuele tema's fan KDE beheare
++Comment[fy]=Algemiene fisuele tema's fan KDE beheare
+ Comment[gl]=Xestionar temas visuais globais de KDE
+ Comment[he]=מנהל ערכות נושא גלובליות עבור KDE
+ Comment[hi]=वैश्विक केडीई दृश्यमय प्रसंग प्रबंधित करें
+--- kcontrol/launch/kcmlaunch.desktop	(revision 488815)
++++ kcontrol/launch/kcmlaunch.desktop	(revision 494868)
+@@ -96,7 +96,7 @@
+ Comment[fa]=نوع نظریات اجرای-برنامه را انتخاب کنید
+ Comment[fi]=Valitse ohjelmien käynnistymisestä kertovan tiedon tyyli
+ Comment[fr]=Définit le style du témoin de démarrage des applications
+-Comment[fy]=Hjir kinst bepale watst visueel te sjen krijst by it begjinnen fan in tapassing.
++Comment[fy]=Hjir kinne jo bepale wat fisueel te sjen is by it begjinnen fan in tapassing.
+ Comment[gl]=Escoller o estilo de indicazón do lanzamento dunha aplicazón
+ Comment[he]=שינוי הגדרות סגנון המשוב לגבי הפעלת יישומים
+ Comment[hi]=अनुप्रयोग-प्रारंभ फ़ीडबैक शैली चुनें
+@@ -157,7 +157,7 @@
+ Keywords[eu]=aplikazioa,abiatu,lanpetuta,kurtsorea,jakinarazpena,sagua,gezia,errotazioa,itzulbira,diskoa,programa,jakinarazi
+ Keywords[fi]=sovellus,käynnistyminen,käynnistäminen,varattu,osoitin,palaute,hiiri, pyörivä,levy,ohjelma
+ Keywords[fr]=application,démarrage,occupé,curseur,souris,pointeur,rotation,disque,programme,rapport
+-Keywords[fy]=applikaasje,start,Begjinne,bezich,rinnerke,feedback,mûs,wizer,rotaasje,rûndraaie,skiif,begjinne,programma,rapport
++Keywords[fy]=applikaasje,start,Begjinne,besich,rinnerke,feedback,mûs,wizer,rotaasje,rûndraaie,skiif,begjinne,programma,rapport
+ Keywords[ga]=feidhmchlár,tosach,tosaigh,gafa,cúrsóir,aisfhotha,luch,luchóg,pointeoir,rothlú,casadh,diosca,tosú,clár,tuairisc
+ Keywords[gl]=aplicazón,início,executar,ocupado,ponteiro,execuzón,rato,ponteiro,rotazón,xiro,disco,início,programa,informe
+ Keywords[he]=עכבר,מצביע,מסתובב,דיסק,תוכנית,דיווח,יישום,הפעלה,אתחול,עסוק,סמן,משוב, application,start,launch,busy,cursor,feedback,mouse,pointer,rotating,spinning,disk, startup,program,report
+--- kcontrol/keys/keys.desktop	(revision 488815)
++++ kcontrol/keys/keys.desktop	(revision 494868)
+@@ -31,7 +31,7 @@
+ Name[fa]=میانبرهای صفحه کلید
+ Name[fi]=Näppäimistön pikavalinnat
+ Name[fr]=Raccourcis clavier
+-Name[fy]=Snelkaaien
++Name[fy]=Fluchtoetsen
+ Name[ga]=Aicearraí Méarchláir
+ Name[gl]=Atallos de Teclado
+ Name[he]=קיצורי מקשים
+@@ -102,7 +102,7 @@
+ Comment[fa]=تنظیم اعمال کلیدها
+ Comment[fi]=Näppäinsidosten asetukset
+ Comment[fr]=Configuration des raccourcis clavier
+-Comment[fy]=Ynstellings foar snelkaaien
++Comment[fy]=Ynstellings foar fluchtoetsen
+ Comment[gl]=Configurazón dos atallos de teclado
+ Comment[he]=שינוי הגדרות מיפוי המקשים
+ Comment[hi]=की-बाइंडिंग का कॉन्फ़िगरेशन
+@@ -171,7 +171,7 @@
+ Keywords[eu]=Teklak,tekla elkarketa globalak,teklen eskema,tekla elkarketak lasterbideak,aplikazio lasterbideak
+ Keywords[fi]=Näppäimet,Yleiset näppäinsidokset,Näppäinteema,Näppäinsidokset,pikavalinnat,sovellusten pikavalinnat
+ Keywords[fr]=touches,raccourcis globaux,modèle de raccourcis,raccourcis clavier,clavier,raccourcis d'applications,applications,raccourcis communs
+-Keywords[fy]=keys,kaaien,kaaiyndielingen,kaaibiningen,key bindings,snelkaaien,globaal 
++Keywords[fy]=keys,toetsen,toetsyndielingen,toetsbiningen,key bindings,fluchtoetsen,globaal 
+ Keywords[gl]=Teclas,Atallos de teclado globais,Esquema de teclas,Atallos de teclado,combinazóns de teclas,atallos de aplicazóns
+ Keywords[he]=מקשים,מיפוי מקשים גלובליים,תצורת מקשים,מיפוי מקשים,קיצורי דרך,קיצורי דרך של יישומים, Keys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcuts
+ Keywords[hi]=कुंजियाँ,ग्लोबल की-बाइंडिंग्स,कुंजी योजना,की-बाइंडिंग्स,शॉर्टकट्स,अनुप्रयोग शॉर्टकट्स
+--- kcontrol/icons/icons.desktop	(revision 488815)
++++ kcontrol/icons/icons.desktop	(revision 494868)
+@@ -108,7 +108,7 @@
+ Comment[fa]=سفارشی سازی شمایل‌های KDE
+ Comment[fi]=Muokkaa KDE:n kuvakkeita
+ Comment[fr]=Personnalisation des icônes de KDE
+-Comment[fy]=KDE-Byldkaikes oanpasse
++Comment[fy]=KDE-byldkaikes oanpasse
+ Comment[ga]=Saincheap Deilbhíní KDE
+ Comment[gl]=Personaliza as Ícones de KDE
+ Comment[he]=שינוי הגדרות הסמלים של KDE
+--- kcontrol/spellchecking/spellchecking.desktop	(revision 488815)
++++ kcontrol/spellchecking/spellchecking.desktop	(revision 494868)
+@@ -47,7 +47,7 @@
+ Name[mk]=Проверка на правопис
+ Name[mn]=Зөв бичиг шалгалт
+ Name[nb]=Stavekontroll
+-Name[nds]=Schrievwies kuntrulleren
++Name[nds]=Klookschriever
+ Name[nl]=Spellingcontrole
+ Name[nn]=Stavekontroll
+ Name[nso]=Molebeledi wa Mongwalo
+@@ -100,7 +100,7 @@
+ Comment[fa]=تنظیم غلط‌گیر املا
+ Comment[fi]=Oikolukuasetukset
+ Comment[fr]=Configurer la vérification orthographique
+-Comment[fy]=Hjir kinst de staveringshifker ynstelle
++Comment[fy]=Hjir kinne jo de staveringshifker ynstelle
+ Comment[ga]=Cumraigh an litreoir
+ Comment[gl]=Configurar o corrector ortográfico
+ Comment[he]=שינוי הגדרות בודק האיות
+@@ -118,7 +118,7 @@
+ Comment[mn]=Зөв бичиг шалгалт тохируулах
+ Comment[mt]=Ikkonfigura l-iċċekkjar tal-ortografija
+ Comment[nb]=Oppsett av stavekontroll
+-Comment[nds]=Instellen för dat Kuntrulleren vun Schrievwiesen
++Comment[nds]=Instellen för dat Kuntrulleren vun Schriefwiesen
+ Comment[nl]=Hier kunt u de spellingcontrole instellen
+ Comment[nn]=Oppsett av stavekontroll
+ Comment[nso]=Beakanya molebeledi wa mongwalo
+--- kdmlib/kgreet_winbind.h	(revision 488815)
++++ kdmlib/kgreet_winbind.h	(revision 494868)
+@@ -36,12 +36,14 @@
+ class KSimpleConfig;
+ class QGridLayout;
+ class QLabel;
++class KdmThemer;
+ 
+ class KWinbindGreeter : public QObject, public KGreeterPlugin {
+ 	Q_OBJECT
+ 
+   public:
+ 	KWinbindGreeter( KGreeterPluginHandler *handler,
++	                 KdmThemer *themer,
+ 	                 QWidget *parent, QWidget *predecessor,
+ 	                 const QString &fixedEntitiy,
+ 	                 Function func, Context ctx );
+--- kdmlib/kgreet_classic.cpp	(revision 488815)
++++ kdmlib/kgreet_classic.cpp	(revision 494868)
+@@ -59,7 +59,7 @@
+ 	pExp( -1 ),
+ 	running( false )
+ {
+-	KdmItem *user_entry, *pw_entry;
++	KdmItem *user_entry = 0, *pw_entry = 0;
+ 	QGridLayout *grid = 0;
+ 	int line = 0;
+ 
+--- kdmlib/kgreet_winbind.cpp	(revision 488815)
++++ kdmlib/kgreet_winbind.cpp	(revision 494868)
+@@ -23,8 +23,11 @@
+ */
+ 
+ #include "kgreet_winbind.h"
++#include "themer/kdmthemer.h"
++#include "themer/kdmitem.h"
+ 
+ #include <klocale.h>
++#include <kdebug.h>
+ #include <kcombobox.h>
+ #include <klineedit.h>
+ #include <kpassdlg.h>
+@@ -34,6 +37,8 @@
+ #include <qlayout.h>
+ #include <qlabel.h>
+ 
++#include <stdlib.h>
++
+ class KDMPasswordEdit : public KPasswordEdit {
+ public:
+ 	KDMPasswordEdit( QWidget *parent ) : KPasswordEdit( parent, 0 ) {}
+@@ -58,6 +63,7 @@
+ }
+ 
+ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
++                                  KdmThemer *themer,
+                                   QWidget *parent, QWidget *pred,
+                                   const QString &_fixedEntity,
+                                   Function _func, Context _ctx ) :
+@@ -69,10 +75,21 @@
+ 	pExp( -1 ),
+ 	running( false )
+ {
+-	QGridLayout *grid = new QGridLayout( 0, 0, 10 );
+-	layoutItem = grid;
++	KdmItem *user_entry = 0, *pw_entry = 0, *domain_entry = 0;
++	QGridLayout *grid = 0;
++
+ 	int line = 0;
++	layoutItem = 0;
+ 
++	if (themer &&
++	    (!(user_entry = themer->findNode( "user-entry" )) ||
++	     !(pw_entry = themer->findNode( "pw-entry" )) ||
++	     !(domain_entry = themer->findNode( "domain-entry" ))))
++		themer = 0;
++
++	if (!themer)
++		layoutItem = grid = new QGridLayout( 0, 0, 10 );
++
+ 	domainLabel = loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
+ 	domainCombo = 0;
+ 	loginEdit = 0;
+@@ -84,7 +101,6 @@
+ 	if (func != ChAuthTok) {
+ 		if (fixedUser.isEmpty()) {
+ 			domainCombo = new KComboBox( parent );
+-			domainLabel = new QLabel( domainCombo, i18n("&Domain:"), parent );
+ 			connect( domainCombo, SIGNAL(activated( const QString & )),
+ 			         SLOT(slotChangedDomain( const QString & )) );
+ 			connect( domainCombo, SIGNAL(activated( const QString & )),
+@@ -94,20 +110,29 @@
+ 			// should handle loss of focus
+ 			loginEdit = new KLineEdit( parent );
+ 			loginEdit->setContextMenuEnabled( false );
+-			loginLabel = new QLabel( loginEdit, i18n("&Username:"), parent );
+-			connect( loginEdit, SIGNAL(lostFocus()), SLOT(slotLoginLostFocus()) );
+-			connect( loginEdit, SIGNAL(lostFocus()), SLOT(slotActivity()) );
+-			connect( loginEdit, SIGNAL(textChanged( const QString & )), SLOT(slotActivity()) );
+-			connect( loginEdit, SIGNAL(selectionChanged()), SLOT(slotActivity()) );
++
+ 			if (pred) {
+ 				parent->setTabOrder( pred, domainCombo );
+ 				parent->setTabOrder( domainCombo, loginEdit );
+ 				pred = loginEdit;
+ 			}
+-			grid->addWidget( domainLabel, line, 0 );
+-			grid->addWidget( domainCombo, line++, 1 );
+-			grid->addWidget( loginLabel, line, 0 );
+-			grid->addWidget( loginEdit, line++, 1 );
++			if (!grid) {
++				loginEdit->adjustSize();
++				domainCombo->adjustSize();
++				user_entry->setWidget( loginEdit );
++				domain_entry->setWidget( domainCombo );
++			} else {
++				domainLabel = new QLabel( domainCombo, i18n("&Domain:"), parent );
++				loginLabel = new QLabel( loginEdit, i18n("&Username:"), parent );
++				grid->addWidget( domainLabel, line, 0 );
++				grid->addWidget( domainCombo, line++, 1 );
++				grid->addWidget( loginLabel, line, 0 );
++				grid->addWidget( loginEdit, line++, 1 );
++			}
++			connect( loginEdit, SIGNAL(lostFocus()), SLOT(slotLoginLostFocus()) );
++			connect( loginEdit, SIGNAL(lostFocus()), SLOT(slotActivity()) );
++			connect( loginEdit, SIGNAL(textChanged( const QString & )), SLOT(slotActivity()) );
++			connect( loginEdit, SIGNAL(selectionChanged()), SLOT(slotActivity()) );
+ 			domainCombo->insertStringList( domains );
+ 			domainCombo->setCurrentItem( defaultDomain );
+ 		} else if (ctx != Login && ctx != Shutdown) {
+@@ -126,19 +151,26 @@
+ 		connect( passwdEdit, SIGNAL(textChanged( const QString & )),
+ 		         SLOT(slotActivity()) );
+ 		connect( passwdEdit, SIGNAL(lostFocus()), SLOT(slotActivity()) );
+-		passwdLabel = new QLabel( passwdEdit,
+-		                          func == Authenticate ?
+-		                            i18n("&Password:") :
+-		                            i18n("Current &password:"),
+-		                          parent );
+-		if (pred) {
+-			parent->setTabOrder( pred, passwdEdit );
+-			pred = passwdEdit;
++
++		if (!grid) {
++			passwdEdit->adjustSize();
++			pw_entry->setWidget( passwdEdit );
++		} else {
++			passwdLabel = new QLabel( passwdEdit,
++			                          func == Authenticate ?
++			                          i18n("&Password:") :
++			                          i18n("Current &password:"),
++			                          parent );
++			if (pred) {
++				parent->setTabOrder( pred, passwdEdit );
++				pred = passwdEdit;
++			}
++			grid->addWidget( passwdLabel, line, 0 );
++			grid->addWidget( passwdEdit, line++, 1 );
+ 		}
+-		grid->addWidget( passwdLabel, line, 0 );
+-		grid->addWidget( passwdEdit, line++, 1 );
+-		if (domainCombo)
+-			domainCombo->setFocus();
++
++		if (loginEdit)
++			loginEdit->setFocus();
+ 		else
+ 			passwdEdit->setFocus();
+ 	}
+@@ -169,9 +201,15 @@
+ KWinbindGreeter::~KWinbindGreeter()
+ {
+ 	abort();
++	if (!layoutItem) {
++		delete loginEdit;
++		delete passwdEdit;
++		delete domainCombo;
++		return;
++	}
+ 	QLayoutIterator it = static_cast<QLayout *>(layoutItem)->iterator();
+ 	for (QLayoutItem *itm = it.current(); itm; itm = ++it)
+-		 delete itm->widget();
++		delete itm->widget();
+ 	delete layoutItem;
+ }
+ 
+@@ -518,9 +556,33 @@
+                   void *ctx )
+ {
+ 	echoMode = getConf( ctx, "EchoMode", QVariant( -1 ) ).toInt();
+-	domains = QStringList::split( ':', getConf( ctx, "winbind.Domains", QVariant( "<local>" ) ).toString() );
++	domains = QStringList::split( ':', getConf( ctx, "winbind.Domains", QVariant( "" ) ).toString() );
++	if (!domains.size()) {
++		FILE *domfile = popen( "wbinfo -m 2>/dev/null", "rt" );
++		if (domfile) {
++			QString tmp;
++			QTextIStream is( domfile );
++			while (!is.atEnd()) {
++				is >> tmp;
++				domains << tmp;
++			}
++			if (pclose( domfile )) // error
++				domains = QStringList();
++		}
++		domains << "<local>";
++	}
+ 	defaultDomain = getConf( ctx, "winbind.DefaultDomain", QVariant( domains.first() ) ).toString();
+-	separator = getConf( ctx, "winbind.Separator", QVariant( '\\' ) ).toString()[0];
++	QString sepstr = getConf( ctx, "winbind.Separator", QVariant( QString::null ) ).toString();
++	if (sepstr.isNull()) {
++		FILE *sepfile = popen( "wbinfo --separator 2>/dev/null", "rt" );
++		if (sepfile) {
++			QTextIStream( sepfile ) >> sepstr;
++			if (pclose( sepfile ))
++				sepstr = "\\";
++		} else
++			sepstr = "\\";
++	}
++	separator = sepstr[0].latin1();
+ 	KGlobal::locale()->insertCatalogue( "kgreet_winbind" );
+ 	return true;
+ }
+@@ -534,13 +596,13 @@
+ }
+ 
+ static KGreeterPlugin *
+-create( KGreeterPluginHandler *handler, KdmThemer * /*themer*/,
++create( KGreeterPluginHandler *handler, KdmThemer *themer,
+         QWidget *parent, QWidget *predecessor,
+         const QString &fixedEntity,
+         KGreeterPlugin::Function func,
+         KGreeterPlugin::Context ctx )
+ {
+-	return new KWinbindGreeter( handler, parent, predecessor, fixedEntity, func, ctx );
++	return new KWinbindGreeter( handler, themer, parent, predecessor, fixedEntity, func, ctx );
+ }
+ 
+ KDE_EXPORT kgreeterplugin_info kgreeterplugin_info = {
+--- khelpcenter/htmlsearch/htmlsearch.desktop	(revision 488815)
++++ khelpcenter/htmlsearch/htmlsearch.desktop	(revision 494868)
+@@ -169,7 +169,7 @@
+ Keywords[eu]=Laguntza,HTML,Bilatu,Indizea,htdig,htsearch,htmerge,Scope,Hizkuntza
+ Keywords[fi]=Ohje,HTML,Etsi,Indeksi,htdig,htsearch,htmerge,Kieli
+ Keywords[fr]=aide,HTML,recherche,index,htdig,htsearch,htmerge,pays,langue
+-Keywords[fy]=help,html,zoeken,,sykje,yndeks,htdig,htsearch,htmerge,scope,taal
++Keywords[fy]=help,html,zoeken,sykje,yndeks,htdig,htsearch,htmerge,scope,taal
+ Keywords[ga]=Cabhair,HTML,Cuardach,Innéacs,htdig,htsearch,htmerge,Scóip,Teanga
+ Keywords[gl]=Axuda,HTML,Procura,Índice,htdig,htsearch,htmerge,Scope,Lingua
+ Keywords[he]=עזרה,HTML,חיפוש,אינדקס,htdig,htsearch,htmerge,טווח,שפה, Help,Search,Index,htdig,htsearch,htmerge,Scope,Language
+--- doc/kate/highlighting.docbook	(revision 488815)
++++ doc/kate/highlighting.docbook	(revision 494868)
+@@ -49,10 +49,13 @@
+ <menuchoice><guimenu>Documents</guimenu><guisubmenu>Highlight
+ Mode</guisubmenu></menuchoice> menu.</para>
+ 
+-<para>The styles and colors used by each syntax highlight definition,
+-as well as which &MIME; Types it should be used for, can be configured
+-using the <link linkend="config-dialog-editor-hl"> Highlight</link>
+-page of the <link linkend="config-dialog">Config Dialog</link>.</para>
++<para>The styles and colors used by each syntax highlight definition
++can be configured using the <link
++linkend="config-dialog-editor-appearance">Appearance</link> page of the
++<link linkend="config-dialog">Config Dialog</link>, while the &MIME; Types
++it should be used for, are handeled by the <link
++linkend="config-dialog-editor-highlighting">Highlight</link>
++page.</para>
+ 
+ <note>
+ <para>Syntax highlighting is there to enhance the readability of
+@@ -67,7 +70,7 @@
+ <para>You can download updated or additional syntax highlight
+ definitions from the &kate; website by clicking the
+ <guibutton>Download</guibutton> button in the <link
+-linkend="config-dialog-editor-hl">Highlight Page</link> of the <link
++linkend="config-dialog-editor-highlighting">Highlight Page</link> of the <link
+ linkend="config-dialog">Config Dialog</link>.</para>
+ </tip>
+ 
+--- doc/kate/advanced.docbook	(revision 488815)
++++ doc/kate/advanced.docbook	(revision 494868)
+@@ -2,6 +2,7 @@
+ <chapterinfo>
+ <authorgroup>
+ <author>&Anders.Lund; &Anders.Lund.mail;</author>
++<author>&Dominik.Haumann; &Dominik.Haumann.mail;</author>
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+ </chapterinfo>
+@@ -18,8 +19,8 @@
+ editing.</para>
+ 
+ <para>The rules for how commenting is done are defined in the syntax
+-definitions, so if syntax highlighting is not used,
+-commenting/uncommenting is not possible.</para>
++definitions, so if syntax highlighting is not used, commenting/uncommenting
++is not possible. </para>
+ 
+ <para>Some formats define single line comment markers, some multiline
+ markers and some both.  If multiline markers are not available,
+@@ -51,7 +52,7 @@
+ <sect1 id="advanced-editing-tools-commandline">
+ <title>The Editor Component Command Line</title>
+ 
+-<para>Kates editor component has an internal command line, allowing you to
++<para>Kate's editor component has an internal command line, allowing you to
+ perform various actions from a minimal GUI. The command line is a text entry
+ in the bottom of the editor area, to show it select
+ <menuchoice><guimenu>View</guimenu><guimenuitem>Switch to Command Line</guimenuitem></menuchoice>
+@@ -60,11 +61,11 @@
+ a set of commands as documented below, and additional commands can be provided
+ by plugins.</para>
+ 
+-<para>To execute a command, press the return key. The command line will indicate
+-wether it succeded and possibly display a message. If you entered the
+-command line by pressing <keycap>F7</keycap> it will automatically
+-hide after a few seconds. To clear the message and enter a new command,
+-press <keycap>F7</keycap> again.</para>
++<para>To execute a command, type the comand then press the return key. The
++command line will indicate wether it succeded and possibly display a message. If
++you entered the command line by pressing <keycap>F7</keycap> it will
++automatically hide after a few seconds. To clear the message and enter a new
++command, press <keycap>F7</keycap> again.</para>
+ 
+ <para>The command line has a built-in help system, issue the command
+ <command>help</command> to get started. To see a list of all available commands
+@@ -83,7 +84,7 @@
+ <sect3 id="advanced-editing-tools-commandline-commands-configure">
+ <title>Commands for Configuring the Editor</title>
+ 
+-<para>These command are provided by the editor component, and allows you to
++<para>These commands are provided by the editor component, and allows you to
+ configure the active document and view only. This is handy if you want to use
+ a setting different from the default settings, for example for indentation.
+ </para>
+@@ -133,7 +134,8 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><cmdsynopsis><command>set-icon-border</command><arg>enable</arg></cmdsynopsis></term>
++<term><cmdsynopsis><command>set-icon-border</command><arg>BOOLEAN enable</arg>
++</cmdsynopsis></term>
+ <listitem><para>Sets the visibility of the icon border.</para></listitem>
+ </varlistentry>
+ 
+@@ -184,13 +186,15 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><cmdsynopsis><command>set-word-wrap</command><arg>BOOLEAN enable</arg></cmdsynopsis></term>
++<term><cmdsynopsis><command>set-word-wrap</command><arg>BOOLEAN 
++enable</arg></cmdsynopsis></term>
+ <listitem><para>Enables dynamic word wrap according to
+ <userinput>enable</userinput></para></listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><cmdsynopsis><command>set-replace-tabs-save</command><arg>BOOLEAN enable</arg></cmdsynopsis></term>
++<term><cmdsynopsis><command>set-replace-tabs-save</command><arg>BOOLEAN enable
++</arg></cmdsynopsis></term>
+ <listitem><para>When enabled, tabs will be replaced with whitespace whenever
+  the document is saved.</para></listitem>
+ </varlistentry>
+@@ -213,7 +217,8 @@
+ <listitem><para>Sets the syntax highlighting system for the document. The
+ argument must be a valid highlight name, as seen in the
+ <menuchoice><guimenu>Tools</guimenu><guisubmenu>Highlighting</guisubmenu></menuchoice>
+-menu. This command provides an autocompletion list for it's argument.</para></listitem>
++menu. This command provides an autocompletion list for its
++argument.</para></listitem>
+ </varlistentry>
+ 
+ </variablelist>
+@@ -223,7 +228,7 @@
+ <sect3 id="advanced-editing-tools-commandline-commands-edit">
+ <title>Commands for editing</title>
+ 
+-<para>These commands modifies the current document.</para>
++<para>These commands modify the current document.</para>
+ 
+ <variablelist>
+ <varlistentry>
+@@ -339,7 +344,8 @@
+ <row><entry><literal>M</literal></entry><entry>The month as number without a leading zero (1-12).</entry></row>
+ <row><entry><literal>MM</literal></entry><entry>The month as number with a leading zero (01-12).</entry></row>
+ <row><entry><literal>MMM</literal></entry><entry>The abbreviated localized month name (e.g. 'Jan'..'Dec').</entry></row>
+-<row><entry><literal>yy</literal></entry><entry>the year as two digit number (00-99).</entry></row>
++<row><entry><literal>yy</literal></entry><entry>The year as two digit number
++(00-99).</entry></row>
+ <row><entry><literal>yyyy</literal></entry><entry>The year as four digit number (1752-8000).</entry></row>
+ <row><entry><literal>h</literal></entry><entry>The hour without a leading zero (0..23 or 1..12 if AM/PM display).</entry></row>
+ <row><entry><literal>hh</literal></entry><entry>The hour with a leading zero (00..23 or 01..12 if AM/PM display).</entry></row>
+@@ -563,7 +569,7 @@
+ <varlistentry>
+ <term><cmdsynopsis><command>ifind</command><arg>pattern</arg></cmdsynopsis></term>
+ <listitem><para>This command provides <quote>as-you-type</quote> searching. You
+-can configure the behavior or the search by appending a colon
++can configure the behavior of the search by appending a colon
+ followed by one or more options, like this:
+ <userinput>ifind:options pattern</userinput>. Allowed options are
+ 
+@@ -600,4 +606,637 @@
+ 
+ </sect1>
+ 
++<sect1 id="advanced-editing-tools-code-folding">
++<title>Using Code Folding</title>
++
++<para>Code folding allows you to hide parts of a document in the editor, making
++it easier to overview large documents. In &kate; the foldable regions are
++calculated using rules defined in the syntax highlight definitions, and
++therefore it is only available in some formats - typically program source code,
++XML markup and similar. Most highlight definitions supporting code folding
++also lets you manually define foldable regions, typically using the
++<userinput>BEGIN</userinput> and <userinput>END</userinput> keywords.</para>
++
++<para>To use the code folding feature, activate the folding markers using
++<menuchoice><guimenu>View</guimenu><guimenuitem>Show Folding
++Markers</guimenuitem></menuchoice> menu item if they are not already visible.
++The Folding Markers Pane in the left side of the screen displays a graphical
++view of the foldable regions, with +/- signs to indicate the possible operation
++on a given region: a - means that the region is expanded, clicking the - will
++collapse the region and a + will be displayed instead.</para>
++
++<para>Four commands are provided to manipulate the state of folding regions,
++see the <link linkend="view-code-folding">menu documentation</link>.
++</para>
++
++<para>If you do not want to use the code folding feature, you can disable
++the <guilabel>Show folding markers (if available)</guilabel> option in the
++<link linkend="config-dialog-editor-appearance">Appearance page of the editor
++configuration</link></para>
++
++</sect1>
++
++<sect1 id="advanced-editing-tools-scripting">
++
++<title>Scripting the editor component with Javascript</title>
++
++<sect2 id="advanced-editing-tools-scripting-introduction">
++
++<title>Introduction</title>
++
++<para>Starting with version 2.5, the &kate; editor component supports
++scripting with ECMA script, also known as JavaScript.</para>
++
++<para>Scripts can be used through <link
++linkend="advanced-editing-tools-commandline">the built in command line</link>
++only. The requirements is that the script is placed in a folder where &kate;
++can find it, along with an optional .desktop file that defines the related
++properties. The valid folder are named <filename>katepart/scripts</filename>
++in the &kde; data folders. You can find the data folders by running the command
++<command>kde-config <option>--path</option> <parameter>data</parameter></command>
++You will usually have at least a system and a personal data folder. Of course
++scripts in the system data folder are available to all users on the system,
++while those in the personal folder are available for you only.</para>
++
++<note><para>This feature is experimental and will most likely change during
++future development.</para>
++<para>We know that many of you will be disappointed because you can't add
++your scripts to the menu or assign shortcuts to them. Sorry, sometime
++in the future that will likely be possible.</para>
++<para>It is also not possible to pass any arguments to your scripts yet. Be
++patient, and that may be added in the bright future ;)</para>
++</note>
++
++</sect2>
++
++<sect2 id="advanced-editing-tools-scripting-reference">
++
++<title>The Kate JavaScript API</title>
++
++<para>Here is listed the complete set of functions and properties available
++in the <type>document</type> and <type>view</type> objects.
++In addition you can of course use all the standard objects such as
++<type>Math</type>, <type>String</type> <type>Regex</type> and so forth.</para>
++
++<para>When a script is run, the <classname>document</classname> object is the
++current document, and the <classname>view</classname> object is the current
++view.</para>
++
++<note><para>The types of arguments are of course not used in JavaScript at
++this time, they are there solely to indicate what sort of value the funcitons
++expect.</para></note>
++
++<variablelist id="advanced-editing-tools-scripting-global">
++<title>Global Functions</title>
++<varlistentry>
++<term><function>debug( <parameter><replaceable>string</replaceable></parameter>)
++[function]</function></term>
++<listitem>
++<itemizedlist>
++<title>parameters</title>
++<listitem><para><parameter>string</parameter> the string to output</para>
++</listitem>
++</itemizedlist>
++<para>Outputs the string to <acronym>STDERR</acronym> using
++<function>kdDebug()</function>. A dedicated output area is used for the output,
++which will be prefixed <computeroutput>Kate (KJS Scripts):</computeroutput>
++</para>
++</listitem>
++</varlistentry>
++</variablelist>
++
++<variablelist id="advanced-editing-tools-scripting-document">
++<title>The <classname>document</classname> API</title>
++
++<varlistentry>
++<term><function>document.attribute( <parameter><replaceable>line</replaceable>
++</parameter>, <parameter><replaceable>column</replaceable></parameter> );
++ [function]</function></term>
++<listitem>
++<itemizedlist>
++<title>Parameters</title>
++<listitem><para><parameter>uint line</parameter> The line of the position for which
++to find the attribute.</para></listitem>
++<listitem><para><parameter>uint column</parameter> The column of the position for
++which to find the attribute.</para></listitem>
++</itemizedlist>
++<para>Returns the numeric ID of the attribute for the document position
++[<parameter>line</parameter>,<parameter>column</parameter>]. The attribute
++represents the visual appearance or style of the text, and is also used to
++calculate the syntax highlight for a specific part of the text in mixed formats
++like HTML or PHP.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.canBreakAt( <parameter>Char c</parameter>,
++<parameter>uint attribute</parameter> ); [function]</function></term>
++<listitem>
++<itemizedlist>
++<title>Parameters</title>
++<listitem><para><parameter>c</parameter> The character to test</para></listitem>
++<listitem><para><parameter>attribute</parameter> The attribute at the position
++of <parameter>c</parameter>.</para></listitem>
++</itemizedlist>
++<para>Returns whether it is allowed to break the line at a character c with
++attribute attribute. The result is decided by querying the highlight owning
++attribute for which characters allow breaking the line.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.canComment( <parameter>uint start_attribute</parameter>,
++<parameter>uint end_attribute</parameter> ); [function]</function></term>
++<listitem>
++<itemizedlist>
++<title>Parameters</title>
++<listitem><para><parameter>start_attribute</parameter> The attribute at the
++start of the range to turn into a comment.</para></listitem>
++<listitem><para><parameter>end_attribute</parameter> The attribute at end of
++the range to turn into a comment.</para></listitem>
++</itemizedlist>
++<para>Returns whether start_attribute and end_attribute belongs to the same
++syntax highlight system. If they do, it is sane.
++</para>
++<example>
++<title>using canComment</title>
++<programlisting>
++if ( document.canComment( document.attribute(1,0), document.attribute(5,0) ) ) {
++    // 1,0 and 5,0 belongs to the same syntax highlighting system
++}
++</programlisting>
++</example>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.clear(); [function]</function></term>
++<listitem><para>Clears the document.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.commentStart( <parameter>uint attribute</parameter> );
++[function]</function></term>
++<listitem>
++<itemizedlist>
++<title>Parameters</title>
++<listitem><para><parameter>attribute</parameter> The attribute of the text for
++which to get the commentStart string.</para></listitem>
++</itemizedlist>
++<para>Returns the string required to start a multiline comment for a text with
++attribute, or an empty string if multiline comments are not supported for that
++text.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.commentMarker( <parameter>uint attribute</parameter> );
++[function]</function></term>
++<listitem>
++<itemizedlist>
++<title>Parameters</title>
++<listitem><para><parameter>attribute</parameter> The attribute of the text for
++which to get the commentMarker string</para></listitem>
++</itemizedlist>
++<para>Returns the string used to mark the rest of the line as a comment for a
++text with attribute or an empty string if single line comments are not supported
++for that text.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.commentEnd( <parameter>uint attribute</parameter> );
++[function]</function></term>
++<listitem>
++<itemizedlist>
++<title>Parameters</title>
++<listitem><para><parameter>attribute</parameter> The attribute of the text for
++which to get the commentEnd string</para></listitem>
++</itemizedlist>
++<para>Returns the string required to end a multiline comment for a text with
++attribute, or an empty string if multiline comments are not supported for that
++text.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.editBegin(); [function]</function></term>
++<listitem>
++<para>Start an editing group. All actions done until the call of editEnd() will
++be grouped as one undo-action.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.editEnd(); [function]</function></term>
++<listitem>
++<para>Finish an editing group.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.highlightMode; [property:read only]</function></term>
++<listitem>
++<para>The name of the document's highlight mode, such as JavaScript or C++.
++If no syntax highlight mode is set for the document, the value is None. Notice
++that you need to use the English name in cases where it differs from the
++translated one.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.indentMode; [property:read only]</function></term>
++<listitem>
++<para>The name of the document indent mode, such as
++<literal>normal</literal> or <literal>cstyle</literal>.
++Remember that if no indent mode is set, the value is <literal>none</literal>.
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.indentWidth; [property:read only]</function></term>
++<listitem>
++<para>The indentation width set for the document. This is used if space
++indenting is enabled.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.insertLine( <parameter>uint line</parameter>,
++<parameter>string text</parameter> ); [function]</function></term>
++<listitem>
++<itemizedlist>
++<title>Parameters</title>
++<listitem><para><parameter>line</parameter> document line number</para>
++</listitem>
++<listitem><para><parameter>text</parameter> text to insert</para></listitem>
++</itemizedlist>
++<para>Inserts a new line with the text <parameter>text</parameter> at the
++line <parameter>line</parameter>.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.insertText( <parameter>uint line</parameter>,
++<parameter>uint column</parameter>, <parameter>string text</parameter> );
++[function]</function></term>
++<listitem>
++<itemizedlist>
++<title>Parameters</title>
++<listitem><para><parameter>line</parameter> the line number</para></listitem>
++<listitem><para><parameter>column</parameter> the column</para></listitem>
++<listitem><para><parameter>text</parameter> the text which is to be
++inserted</para></listitem>
++</itemizedlist>
++<para>Inserts the text <parameter>text</parameter> in line
++<parameter>line</parameter> and column <parameter>column</parameter>.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term>document.length(); [function]</term>
++<listitem>
++<para>Returns the document's size in bytes.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.lines(); [function]</function></term>
++<listitem>
++<para>Returns the number of lines in the document.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term>document.mixedIndent; [property:read only]</term>
++<listitem>
++<para>A boolean telling whether the mixed-indent setting is enabled for the
++document. If so, indentation is optimized to contain a mix of tab characters and
++spaces like used by the Emacs editor.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term>document.removeLine( <parameter>uint line</parameter> ); [function]</term>
++<listitem>
++<itemizedlist>
++<title>Parameters</title>
++<listitem><para><parameter>line</parameter> line number</para></listitem>
++</itemizedlist>
++<para>Removes the document line line.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.removeText( <parameter>uint startLine</parameter>,
++<parameter>uint startColumn</parameter>, <parameter>uint endLine</parameter>,
++<parameter>uint endColumn</parameter> ); [function]</function></term>
++<listitem>
++<itemizedlist>
++<title>Parameters</title>
++<listitem><para><parameter>startLine</parameter> specifies the beginning
++line</para></listitem>
++<listitem><para><parameter>startColumn</parameter> specifies the beginning
++column</para></listitem>
++<listitem><para><parameter>endLine</parameter> specifies the ending
++line</para></listitem>
++<listitem><para><parameter>endColumn</parameter> specifies the ending
++column</para></listitem>
++</itemizedlist>
++<para>Removes the text range from line <parameter>startLine</parameter> and
++column <parameter>startColumn</parameter> up to line
++<parameter>endLine</parameter> and column <parameter>endColumn</parameter>.
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.setText( <parameter>string text</parameter> );
++[function]</function></term>
++<listitem>
++<itemizedlist>
++<title>Parameters</title>
++<listitem><para><parameter>text</parameter> document text</para></listitem>
++</itemizedlist>
++<para>Sets the entire document content to <parameter>text</parameter>.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.spaceIndent; [property:read only]</function></term>
++<listitem>
++<para>A boolean telling whether space-indent is enabled for the document.
++If so, the document is indented with indentWidth spaces pr level, otherwise
++indentation is one tab character pr. level.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.textFull(); [function]</function></term>
++<listitem>
++<para>Returns the full document text. If the text spans over multiple lines the
++linefeed character is <constant>\n</constant>.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.textLine( uint line ); [function]</function></term>
++<listitem>
++<itemizedlist>
++<title>Parameters</title>
++<listitem><para><parameter>line</parameter> the line</para></listitem>
++</itemizedlist>
++<para>Returns the text of line <parameter>line</parameter>.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>document.textRange( <parameter>uint startLine</parameter>,
++<parameter>uint startColumn</parameter>, <parameter>uint endLine</parameter>,
++<parameter>uint endColumn</parameter> ); [function]</function></term>
++<listitem>
++<itemizedlist>
++<title>Parameters</title>
++<listitem><para><parameter>startLine</parameter> specifies the beginning
++line</para></listitem>
++<listitem><para><parameter>startColumn</parameter> specifies the beginning
++column</para></listitem>
++<listitem><para><parameter>endLine</parameter> specifies the ending line</para>
++</listitem>
++<listitem><para><parameter>endColumn</parameter> specifies the ending
++column</para></listitem>
++</itemizedlist>
++<para>Returns the specified text range. If the range spans over multiple lines
++the linefeed character is <constant>\n</constant>.</para>
++</listitem>
++</varlistentry>
++
++</variablelist><!--/ document API -->
++
++<variablelist id="advanced-editing-tools-scripting-view">
++<title>The <classname>view</classname> API</title>
++
++<varlistentry>
++<term><function>view.clearSelection(); [function]</function></term>
++<listitem>
++<para>Deselects all text.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>view.cursorColumn(); [function]</function></term>
++<listitem>
++<para>Returns the current cursor column (TAB characters are expanded).</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>view.cursorColumnReal(); [function]</function></term>
++<listitem>
++<para>Returns the current real cursor column (TAB characters counts one).</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>view.cursorLine(); [function]</function></term>
++<listitem>
++<para>Returns the current cursor line.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>view.hasSelection(); [function]</function></term>
++<listitem>
++<para>Returns <constant>true</constant> if the view contains selected text,
++otherwise <constant>false</constant>.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>view.removeSelectedText(); [function]</function></term>
++<listitem>
++<para>Removes the selected text, if the view has a selection.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>view.selectAll(); [function]</function></term>
++<listitem>
++<para>Selects all text.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>view.selection(); [function]</function></term>
++<listitem>
++<para>Returns the selected text. If the selection spans over multiple lines the
++linefeed character is <constant>\n</constant>.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>view.selectionEndColumn; [property:read only]</function></term>
++<listitem>
++<para>Returns the ending column of the selection.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>view.selectionEndLine; [property:read only]</function></term>
++<listitem>
++<para>Returns the ending line of the selection.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>view.selectionStartColumn; [property:read only]</function></term>
++<listitem>
++<para>Returns the starting column of the selection.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>view.selectionStartLine; [property:read only]</function></term>
++<listitem>
++<para>Returns the starting line of the selection.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>view.setCursorPosition( <parameter>uint line</parameter>,
++<parameter>uint column</parameter> ); [function]</function></term>
++<listitem>
++<itemizedlist>
++<title>Parameters</title>
++<listitem><para><parameter>line</parameter> Specifies the line for the
++cursor.</para></listitem>
++<listitem><para><parameter>column</parameter> Specifies the column for the
++cursor.</para></listitem>
++</itemizedlist>
++<para>Sets the input cursor position in the view to [<parameter>line</parameter>,
++<parameter>col</parameter>]. This sets the cursor position by visual means,
++that is the a TAB character counts up to <replaceable>tabwidth</replaceable>
++depending on the position inside the line. The cursor position is made visible.
++Both line and column are zero-based.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>view.setCursorPositionReal( <parameter>uint line</parameter>,
++<parameter>uint column</parameter> ); [function]</function></term>
++<listitem>
++<itemizedlist>
++<title>Parameters</title>
++<listitem><para><parameter>line</parameter> Specifies the line for the
++cursor.</para></listitem>
++<listitem><para><parameter>column</parameter> Specifies the column for the
++cursor.</para></listitem>
++</itemizedlist>
++<para>Sets the input cursor position to [<parameter>line</parameter>,
++<parameter>col</parameter>]. This sets the string position, that is a TAB
++character counts for 1. The cursor position is made visible. Both line and
++column are zero-based.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><function>view.setSelection( <parameter>uint startLine</parameter>,
++<parameter>uint startColumn</parameter>, <parameter>uint endLine</parameter>,
++<parameter>uint endColumn</parameter> ); [function]</function></term>
++<listitem>
++<itemizedlist>
++<title>Parameters</title>
++<listitem><para><parameter>startLine</parameter> specifies the beginning line</para></listitem>
++<listitem><para><parameter>startColumn</parameter> specifies the beginning column</para></listitem>
++<listitem><para><parameter>endLine</parameter> specifies the ending line</para></listitem>
++<listitem><para><parameter>endColumn</parameter> specifies the ending column</para></listitem>
++</itemizedlist>
++<para>Sets a selection from line <parameter>startLine</parameter> and column
++<parameter>startColumn</parameter> up to line <parameter>endLine</parameter>
++and column <parameter>endColumn</parameter>.</para>
++</listitem>
++</varlistentry>
++
++</variablelist>
++
++<example id="advanced-editing-tools-scripting-example">
++
++<title>A sample script</title>
++<para>As an example we will create a small script that uppercases the selection.
++It is obvious that we first need to check whether a selection exists, if so we
++get the text, change the case and then replace it with the new one. An
++implementation could look like this:</para>
++
++<programlisting>
++if ( view.hasSelection() )
++{
++  // uppercase selection
++  column = view.selectionStartColumn;
++  line = view.selectionStartLine;
++
++  selection = view.selection().toUpperCase();
++
++  document.editBegin();
++  view.removeSelectedText();
++  document.insertText( line, column, selection );
++  document.editEnd();
++}
++</programlisting>
++
++<para>To group this action together so that they will be reverted by a single
++activation of <guimenuitem>Undo</guimenuitem> we encapsulate the lines
++<programlisting>view.removeSelectedText()</programlisting> and
++<programlisting>document.insertText()</programlisting> with a
++<programlisting>document.editBegin()</programlisting> and
++<programlisting>document.editEnd()</programlisting>.</para>
++
++</example>
++
++<example id="advanced-editing-tools-desktop-example">
++<title>A sample <filename>.desktop</filename> file</title>
++
++<para>Here is a sample .desktop file that accompanies the above script.</para>
++
++<programlisting>
++# Example of a .desktop file
++[Desktop Entry]
++Encoding=UTF-8
++Name=Kate Part JavaScript Uppercase
++Comment=Script to uppercase the selection
++X-Kate-Command=uppercase-selection
++X-Kate-Help=&lt;p&gt;Usage: &lt;code&gt;uppercase-selection&lt;/code&gt;&lt;/p&gt;
++</programlisting>
++
++<para>As you can see you can define the Encoding, set a Name, a Comment, a help
++text using X-Kate-Help and the command line name via X-Kate-Command. The entries
++Name, Comment and X-Kate-Help are automatically translated into other languages
++by the KDE translation teams, if the files are in KDE's SVN repository.</para>
++
++</example>
++
++<sect3>
++<title>Putting it togeather</title>
++
++<para>&kate; will search the script folders (see <link
++linkend="advanced-editing-tools-scripting-introduction">above</link>)  for
++<filename>*.js</filename> files. For every file it checks whether there is a
++corresponding <filename>.desktop</filename> file, like for uppercase.js it
++would look for uppercase.desktop. </para>
++<para>If a <filename>.desktop</filename> file can not be found the script will
++be registered in katepart's command line with the filename without the ending
++.js, so in our example this would be <literal>uppercase</literal>. If the
++command-name is fine and you don't need the extra features a
++<filename>.desktop</filename> file provides you do not need a
++<filename>.desktop</filename> file at all. </para>
++<para>If a <filename>.desktop</filename> file exists katepart will read the name
++under which the script will be registered from the .desktop-entry
++X-Kate-Command, for example X-Kate-Command=uppercase-selection.</para>
++
++</sect3>
++
++</sect2>
++
++</sect1>
++
+ </chapter>
+--- doc/kate/part.docbook	(revision 488815)
++++ doc/kate/part.docbook	(revision 494868)
+@@ -1,7 +1,7 @@
+ <chapter id="kate-part">
+ <chapterinfo>
+ <authorgroup>
+-<author><personname><firstname></firstname></personname></author>
++<author>&Anders.Lund; &Anders.Lund.mail;</author>
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+ </chapterinfo>
+@@ -61,6 +61,15 @@
+ </listitem>
+ </varlistentry>
+ 
++<varlistentry>
++<term>The Folding Pane</term>
++<listitem>
++<para>The folding pane allows you to collapse or expand foldable blocks
++of lines. The calculation of the foldable regions are done according to
++rules in the syntax highlight definition for the document.</para>
++</listitem>
++</varlistentry>
++
+ </variablelist>
+ 
+ <itemizedlist>
+@@ -85,8 +94,36 @@
+ <sect1 id="kate-part-navigation">
+ <title>Navigating in the Text</title>
+ 
+-<para>This section is not yet documented.</para>
++<para>Moving around in the text in &kate; is like in most graphical text
++editors. You move the cursor using the arrow keys and the
++<keycap>Page Up</keycap>, <keycap>Page Down</keycap>, <keycap>Home</keycap> and
++<keycap>End</keycap> keys in combination with the <keycap>Ctrl</keycap> and
++<keycap>Shift</keycap> modifiers. The <keycap>Shift</keycap> key is always used
++to generate a selection, while the <keycap>Ctrl</keycap> key have different
++effects on different keys:
++<itemizedlist>
++<listitem><para>For the <keycap>Up</keycap> and <keycap>Down</keycap> keys it
++means scroll rather than move the cursor.</para></listitem>
++<listitem><para>For the <keycap>Left</keycap> and <keycap>Right</keycap>
++keys it means skip words rather than characters.</para></listitem>
++<listitem><para>for the <keycap>Page Up</keycap> and <keycap>Page Down</keycap>
++keys it means move to the visible edge of the view rather than browse.</para>
++</listitem>
++<listitem><para>For the <keycap>Home</keycap> and <keycap>End</keycap> keys it
++means move to the beginning or end of the document rather than the beginning or
++end of the line.</para></listitem>
++</itemizedlist>
++</para>
+ 
++<para>&kate; also provides you with a way to quickly jump to a matching brace
++or paranthese: Place the cursor on the inside of a parenthese or brace
++character, and press <keycombo><keycap>Ctrl</keycap><keycap>6</keycap></keycombo>
++to jump to the matching parenthese or brace.</para>
++
++<para>In addition you can use
++<link linkend="kate-part-bookmarks">bookmarks</link> to quickly jump to
++positions that you define on your own.</para>
++
+ </sect1>
+ 
+ <sect1 id="kate-part-selection">
+@@ -171,7 +208,7 @@
+ <para>Overwrite Selection is enabled by default.</para>
+ 
+ <para>To change the setting for this option, use the <link
+-linkend="config-dialog-editor-select">Select Page</link> of the <link
++linkend="config-dialog-editor-cursor-selection">Select Page</link> of the <link
+ linkend="config-dialog">Configuration Dialog</link>.</para>
+ 
+ </sect2>
+@@ -188,7 +225,7 @@
+ <para>Persistent Selection is disabled by default.</para>
+ 
+ <para>Persistent Selection can be enabled in the <link
+-linkend="config-dialog-editor-select">Select Page</link> of the <link
++linkend="config-dialog-editor-cursor-selection">Select Page</link> of the <link
+ linkend="config-dialog">Configuration Dialog</link>.</para>
+ 
+ <warning>
+@@ -209,7 +246,7 @@
+ <menuchoice><guimenu>Edit</guimenu>
+ <guimenuitem>Copy</guimenuitem></menuchoice> menu item. Additionally,
+ selecting text with the mouse will cause selected text to be copied to
+-the clipboard.</para>
++the X selection.</para>
+ 
+ <para>To paste the text currently in the clipboard, use the
+ <menuchoice>
+@@ -279,10 +316,10 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guilabel>From Beginning</guilabel></term>
++<term><guilabel>From cursor</guilabel></term>
+ <listitem>
+-<para>If checked, the search will start at the beginning of the first
+-line in the document, otherwise it will start at cursor position.</para>
++<para>If checked, the search will start at cursor position, otherwise it will
++start at the beginning of the first line in the document.</para>
+ </listitem>
+ </varlistentry>
+ 
+@@ -344,7 +381,7 @@
+ 
+ <varlistentry>
+ <term><guibutton>Close</guibutton></term>
+-<listitem><para>Activate this skip the current match and end the
++<listitem><para>Activate this to skip the current match and end the
+ searching.</para></listitem>
+ </varlistentry>
+ 
+@@ -369,14 +406,13 @@
+ <para>To find text, launch the <guilabel>Find Text</guilabel> Dialog
+ with <keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo>or
+ from the <menuchoice><guimenu>Edit</guimenu>
+-<guimenuitem>Find...</guimenuitem></menuchoice> menu item,enter a
++<guimenuitem>Find...</guimenuitem></menuchoice> menu item, enter a
+ search string, set the <link
+ linkend="find-replace-dialog">options</link> as desired and hit
+-<guibutton>Ok</guibutton>. If no matches is found between the starting
+-point for the search (either the text cursor position or the beginning
+-of the document) you will be prompted for permission to continue from
+-the start (or end, if you are searching backwards) of the
+-document.</para>
++<guibutton>Ok</guibutton>. If the search was started at cursor position and no
++match was found before reaching the end (or beginning if you are searching
++backward) of the document, you will be asked if you want to wrap the search.
++</para>
+ 
+ <para>If a match is found it is selected and the <guilabel>Find
+ Text</guilabel> Dialog is hidden, but stay tuned, finding further
+@@ -392,8 +428,9 @@
+ Previous</guimenuitem></menuchoice> command or press <keycombo
+ action="simul">&Shift;<keycap>F3</keycap></keycombo>.</para>
+ 
+-<para>If no match is found before reaching the document border, you
+-will be prompted for permission to cross that.</para>
++<para>If no match is found before reaching the document end (or beginning if you
++are searching backward) , you will be asked if you want to wrap the search.
++</para>
+ 
+ </sect2>
+ 
+@@ -405,7 +442,7 @@
+ <guimenuitem>Replace</guimenuitem></menuchoice> command, or the
+ <keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo> shortcut,
+ enter a search string and optionally a replace string (if the replace
+-string is empty, each match will be replaced with &quot;&quot;), set
++string is empty, each match will be removed), set
+ the <link linkend="find-replace-dialog">options</link> as desired and
+ hit the <guibutton>Ok</guibutton> button.</para>
+ 
+@@ -416,6 +453,11 @@
+ on those.</para>
+ </tip>
+ 
++<tip><para>You can do <command>find</command>, <command>replace</command> and
++<command>ifind</command> (incremental search) from the
++<link linkend="advanced-editing-tools-commandline">command line</link>.</para>
++</tip>
++
+ </sect2>
+ 
+ </sect1>
+@@ -430,13 +472,13 @@
+ 
+ <itemizedlist>
+ <listitem>
+-<para>Moving the insertion cursor to that line, and activate the
++<para>Move the insertion cursor to the line and activate the
+ <menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>Toggle
+ Bookmark</guimenuitem></menuchoice> (<keycombo
+ action="simul">&Ctrl;<keycap>B</keycap></keycombo>) command.</para>
+ </listitem>
+ <listitem>
+-<para>Clicking in the Icon Border next to that line.</para>
++<para>Click in the Icon Border next to the line.</para>
+ </listitem>
+ </itemizedlist>
+ 
+@@ -448,13 +490,13 @@
+ the beginning of a bookmarked line, open the menu and select the
+ bookmark.</para>
+ 
+-<tip>
+-<para>If the <link linkend="config-dialog-general-reopen-files">Reopen
+-Files</link> option in the <link linkend="config-dialog">Config
+-Dialog</link> is enabled (or if &kate; was started by the session
+-manager), your bookmarks will be restored when the document is
+-reopened.</para>
+-</tip>
++<para>To quickly move between bookmarks or to the next/previous bookmark,
++use the <menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>Next</guimenuitem>
++</menuchoice> (<keycombo action="simul"><keycap>Ctrl</keycap>
++<keycap>Page Down</keycap></keycombo>)  or <menuchoice>
++<guimenu>Bookmarks</guimenu><guimenuitem>Previous</guimenuitem></menuchoice>
++(<keycombo action="simul"><keycap>Ctrl</keycap><keycap>Page Up</keycap>
++</keycombo>) commands.</para>
+ 
+ </sect1>
+ 
+@@ -470,7 +512,7 @@
+ <link linkend="config-dialog-editor-edit">edit page</link> of the <link linkend="config-dialog">configuration dialog</link>.</para>
+ 
+ <para>To set the maximum line width (maximum characters per line), use the
+-<link linkend="config-dialog-editor-edit-wrap-words-at"><guibutton>Wrap Words At</guibutton></link>
++<link linkend="config-dialog-editor-wrap-words-at"><guibutton>Wrap Words At</guibutton></link>
+ option in the <link linkend="config-dialog-editor-edit">edit page</link> of the <link linkend="config-dialog">configuration
+ dialog</link>.</para>
+ 
+@@ -494,7 +536,7 @@
+ <sect1 id="kate-part-autoindent">
+ <title>Using automatic indenting</title>
+ 
+-<para>Kates editor component supports a variation of autoindenting modes,
++<para>&kate;s editor component supports a variation of autoindenting modes,
+ designed for different text formats. You can pick from the available modes using
+ the <menuchoice><guimenu>Tools</guimenu><guisubmenu>Indentation</guisubmenu></menuchoice>
+ menu. The autoindent modules also provides a function
+@@ -503,11 +545,13 @@
+ you may reindent your entire document by selecting all the text and activating
+ that action.</para>
+ 
+-<!-- TODO add a tip with a line to the variable and filetype sections -->
++<para>All the indent modes use the indentation related settings in the active
++document.</para>
+ 
+-<para>All the indenters uses the indentation settings in the active document:
+-wether to indent with TABs or whitespace, indent-width and wether to do
+-mixed indenation.</para>
++<tip><para>You can set all sorts of configuration variables, including
++those related to indentation using <link linkend="config-variables">Document
++Variables</link> and <link linkend="config-dialog-editor-filetypes">File
++types</link>.</para></tip>
+ 
+ <variablelist>
+ 
+@@ -528,7 +572,7 @@
+ </varlistentry>
+ 
+ <varlistentry><term>C Style</term>
+-<listitem><para>A indenter for C and similar languages, such as
++<listitem><para>An indenter for C and similar languages, such as
+ C++, C#, java, javascript and so on. This indenter will not work with scripting
+ languages such as Perl or PHP.</para></listitem>
+ </varlistentry>
+@@ -541,7 +585,7 @@
+ 
+ <varlistentry>
+ <term>Python Style</term>
+-<listitem><para>A indenter specifically for the python scripting language.
++<listitem><para>An indenter specifically for the python scripting language.
+ </para></listitem>
+ </varlistentry>
+ 
+@@ -609,7 +653,7 @@
+ <term><literal>var-indent-couple-attribute</literal></term>
+ <listitem>
+ <para>When looking for unmatched couple openings/closings,
+-only characters with this attribute is considered. The value must be the
++only characters with this attribute are considered. The value must be the
+ attribute name from the syntax xml file, for example "Symbol". If it's not
+ specified, attribute 0 is used (usually 'Normal Text').</para>
+ </listitem>
+--- doc/kate/index.docbook	(revision 488815)
++++ doc/kate/index.docbook	(revision 494868)
+@@ -43,13 +43,13 @@
+ 
+ <legalnotice>&FDLNotice;</legalnotice>
+ 
+-<date>2002-01-26</date>
+-<releaseinfo>2.00.00</releaseinfo>
++<date>2005-12-29</date>
++<releaseinfo>2.5.0</releaseinfo>
+ 
+ <abstract>
+ <para>&kate; is a programmer's text editor for &kde; 2.2 and above.</para>
+ 
+-<para>This handbook documents &kate; Version 2.4</para>
++<para>This handbook documents &kate; Version 2.5.0</para>
+ </abstract>
+ 
+ <keywordset>
+@@ -117,7 +117,7 @@
+ <title>Credits and License</title>
+ 
+ <para>
+-&kate;. Program copyright 2000, 2001, 2002 by the &kate; developer team.
++&kate;. Program copyright 2000, 2001, 2002 - 2005 by the &kate; developer team.
+ </para>
+ 
+ <variablelist>
+@@ -236,7 +236,7 @@
+ <para>Documentation copyright 2000,2001 &Seth.Rothberg;
+ &Seth.Rothberg.mail;</para>
+ 
+-<para>Documentation copyright 2002, 2003 &Anders.Lund;
++<para>Documentation copyright 2002, 2003, 2005 &Anders.Lund;
+ &Anders.Lund.mail;</para>
+ 
+ <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
+--- doc/kate/mdi.docbook	(revision 488815)
++++ doc/kate/mdi.docbook	(revision 494868)
+@@ -20,7 +20,7 @@
+ 
+ <para><indexterm><primary>Main window</primary></indexterm>
+ The &kate; Main Window is a standard &kde; application window,
+-with the addition of dockable subwindows, or tool windows. It has a
++with the addition of side bars containing tool views. It has a
+ Menubar with all the common menus, and some more, and a toolbar
+ providing access to commonly used commands.</para>
+ 
+@@ -33,24 +33,21 @@
+ 
+ <itemizedlist>
+ <listitem><para><link linkend="kate-mdi-tools-file-list">The File List</link></para></listitem>
+-<listitem><para><link linkend="kate-mdi-tools-file-selector">The File Selector</link></para></listitem>
++<listitem><para><link linkend="kate-mdi-tools-file-selector">The Filesystem
++Browser</link></para></listitem>
+ <listitem><para><link linkend="kate-mdi-tools-konsole">The Built in Terminal Emulator</link></para></listitem>
+ </itemizedlist>
+ 
+-<para>And possibly other tool windows, for example provided by
++<para>And possibly other tool views, for example provided by
+ plugins.</para>
+ 
+-<para><indexterm><primary>Tool Windows</primary></indexterm>
+-The Tool Windows can be placed anywhere you want them inside or
+-outside the main window by dragging the handle bar in the top of them
+-with the &LMB; pressed, and stacked in shared tab windows if
+-desired.</para>
++<para>Tool views can be positioned in any sidebar, to move a tool right click
++its sidebar button and select from the &RMB; menu</para>
+ 
+-<para>When dragging a docked window, a black rectangle will be
+-displayed to indicate where the window will be placed if you release
+-the mouse button, unless you move the mouse cursor outside the main
+-window, in which case the dragged window will become a free floating
+-top level window.</para>
++<para>A tool view can be marked as <emphasis>persistent</emphasis> in the &RMB;
++menu for its sidebar button. The sidebar can contain
++more tools at one time so that when a tool is persistant other tools can be
++shown simultaneously.</para>
+ 
+ </sect2>
+ 
+@@ -144,13 +141,13 @@
+ </sect1>
+ 
+ <sect1 id="kate-mdi-tools-file-selector">
+-<title>The File Selector</title>
++<title>The Filesystem Browser</title>
+ 
+-<para><indexterm><primary>File selector</primary></indexterm>
+-The File Selector is a folder viewer, allowing you to open
++<para><indexterm><primary>Filesystem Browser</primary></indexterm>
++The Filesystem Browser is a folder viewer, allowing you to open
+ files from a displayed folder in the current frame.</para>
+ 
+-<para>From top down, the file selector consist of the following
++<para>From top down, the Filesystem Browser consist of the following
+ elements:</para>
+ 
+ <variablelist>
+@@ -247,7 +244,7 @@
+ <para>The default location in the &kate; window is at the bottom,
+ below the editing area.</para>
+ 
+-<para>You can configure the &konsole; using it's &RMB; menu, for more
++<para>You can configure the &konsole; using its &RMB; menu, for more
+ information, see the &konsole; manual.</para>
+ 
+ </sect1>
+--- doc/kate/configuring.docbook	(revision 488815)
++++ doc/kate/configuring.docbook	(revision 494868)
+@@ -1,7 +1,7 @@
+ <chapter id="configuring-kate">
+ <chapterinfo>
+ <authorgroup>
+-<author><personname><firstname></firstname></personname></author>
++<author>&Anders.Lund; &Anders.Lund.mail;</author>
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+ </chapterinfo>
+@@ -62,114 +62,270 @@
+ 
+ <para>The &kate; configuration dialog displays a tree of topics on the
+ left, and a configuration page corresponding to the selected topic on
+-the right. The tree groups the pages of the dialog into logical
+-groups.</para>
++the right.</para>
+ 
+-<sect2 id="config-dialog">
+-<title>The &kate; group</title>
++<para>The configuration is divided into two groups, namely
++<itemizedlist>
++<listitem><para><link linkend="config-dialog">Application configuration</link>
++</para></listitem>
++<listitem><para><link linkend="config-dialog-editor">Editor component configuration</link></para></listitem>
++
++</itemizedlist>
++
++</para>
++
++</sect1>
++
++<sect1 id="config-dialog">
++<title>The &kate; Application Configuration</title>
+ <para>This group contains pages to configure the main &kate; application</para>
+ 
+-<sect3 id="config-dialog-general">
++<sect2 id="config-dialog-general">
+ <title>The General Page</title>
+-<para>Global Options for &kate;</para>
++<para>This section contains a few global options for &kate;</para>
+ 
+ <variablelist>
++
+ <varlistentry>
+-<term>Application Mode</term>
++<term><anchor id="config-dialog-general-show-full-path" />
++<guilabel>Show Full Path in Title</guilabel></term>
++<listitem><para>When enabled, Kate will display the full URL of your
++current document in the window title, rather than just the file name.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="config-general-behavior"/>
++<guilabel>Behavior</guilabel></term>
+ <listitem>
+-<para><indexterm><primary>MDI</primary><secondary>SDI</secondary></indexterm>
+-This group lets you choose between &kate; <acronym>MDI</acronym> and
+-&kate; <acronym>SDI</acronym> mode, selecting the appropriate button.</para>
+- <para>&kate; <acronym>MDI</acronym>
+-(Multiple Document Interface), which is the default mode, makes &kate; use a
+-single window for all open files. You can choose the document to edit from the
+-File List (docked into the &kate; window by default) or by
+-selecting the document from the <guimenu>Document</guimenu> menu.</para>
+-<para>&kate; <acronym>SDI</acronym> (Single Document Interface) will make &kate; open each
+-document in a window of its own, and the File List/File Selector will have a
+-separate window.</para>
+- <para>If you change this setting, you will need to
+-restart &kate; for it to take effect.</para>
++<variablelist>
++<varlistentry>
++<term>
++<anchor id="config-dialog-general-sync-konsole"/>
++<guibutton>Sync Konsole with Active Document</guibutton></term>
++<listitem><para>This will cause the built-in &konsole; to
++<command>cd</command> into the directory of the active document when
++launched and when a new document gets the focus. If not enabled, you
++have to do all your navigation in the &konsole; on your own.
++</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="config-dialog-general-warn-mod"/>
++<guilabel>Warn about files modified by foreign processes</guilabel></term>
++<listitem><para>When enabled, &kate; will notify you about files modified
++from outside the application whenever the main window receives input focus.
++You will be able to deal with several modified files at once, you
++can reload, save or discard changed files in groups.</para>
++<para>If not enabled, &kate; will prompt you for action when a externally
++modified file receives focus within the application.</para>
+ </listitem>
+ </varlistentry>
+ 
++</variablelist>
++</listitem>
++</varlistentry><!-- /behavior group -->
++
+ <varlistentry>
+-<term>At Startup</term>
+-<listitem><para>These options determine how
+-and if &kate; will restore your editing session when launched after a
+-normal shutdown (if restored by the session manager, &kate; will
+-always attempt to restore your session as close as possible to what it
+-was when you last used &kate;).</para>
++<term><anchor id="config-general-meta-data"/>
++<guilabel>Meta Data</guilabel></term>
++<listitem>
+ 
+ <variablelist>
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-general-reopen-files"/>
+-<guibutton>Reopen Files</guibutton></term>
+-<listitem><para>If this option is enabled, files open when you last
+-closed &kate; will be reopened. Bookmarks will be restored, and the
+-cursor position, icon border and line numbers settings for the last
+-editor used with the document will be reestablished</para></listitem>
++<term><anchor id="config-general-keep-meta-information"/>
++<guilabel>Keep meta-information past sessions</guilabel></term>
++<listitem><para>When enabled, &kate; will store meta data such as bookmarks
++and session configuration even when you close your documents. The data
++will be used if the document is unchanged when reopened.</para></listitem>
+ </varlistentry>
++
+ <varlistentry>
+-<term><guibutton>Restore View Configuration</guibutton></term>
+-<listitem><para>If this option is enabled, &kate; will attempt to restore your frames exactly as
+-you left them.</para></listitem>
++<term><anchor id="config-general-delete-meta-information-after"/>
++<guilabel>Delete unused meta information after</guilabel></term>
++<listitem><para>Set the maximum number of days to keep meta information
++for unopen files. This helps keeping the database of meta information
++reasonably sized.</para></listitem>
+ </varlistentry>
++
+ </variablelist>
+ 
+ </listitem>
++</varlistentry><!-- /meta data group -->
+ 
++</variablelist>
++</sect2>
++
++<sect2 id="config-dialog-sessions">
++<title>The Sessions Page</title>
++
++<para>This section contains options related to <link
++linkend="fundamentals-using-sessions">using sessions</link>.</para>
++
++<variablelist>
++
++<varlistentry>
++<term><anchor id="config-dialog-sessions-elements"/>
++<guilabel>Elements of Sessions</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Include window configuration</guilabel></term>
++<listitem><para>If enabled, &kate; will save the window configuration
++with each session.</para></listitem>
+ </varlistentry>
++</variablelist>
++</listitem>
++</varlistentry><!-- /elements of sessions -->
+ 
+ <varlistentry>
+-<term><guibutton>Restrict to single instance</guibutton></term>
+-<listitem><para>Enabling this means you can only have one running
+-instance of &kate; running at any given time. If you attempt to start
+-another one, the current instance will take over and also open files
+-as requested. For example, if you use &kate; for displaying sources
+-for web pages in Konqueror, they will all be opened in an existing
+-instance of &kate; if this option is enabled.</para></listitem>
++<term><anchor id="config-dialog-sessions-startup-behavior"/>
++<guilabel>Behavior on Application Startup</guilabel></term>
++<listitem>
++<para>Select how you want &kate; to behave at startup. This setting can be
++overridden by specifying what to do on the <link
++linkend="command-line-options">command line</link>.</para>
++<variablelist>
++<varlistentry>
++<term><guilabel>Start new session</guilabel></term>
++<listitem><para>With this option, &kate; will start a new, unnamed session
++when you start it.</para></listitem>
+ </varlistentry>
++<varlistentry>
++<term><guilabel>Load last used session</guilabel></term>
++<listitem><para>&kate; will use the most recently opened session at
++startup. This is good if you want to use the same session always or switch
++rarely.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Manually choose a session</guilabel></term>
++<listitem><para>&kate; will display a small dialog that lets you choose
++your preferred session. This is the default behavior. Nice if you use a lot of
++different sessions frequently.</para></listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry><!-- /startup behavior -->
+ 
+ <varlistentry>
+-<term><guibutton>Show Contents While Resizing
+-Frames</guibutton></term> <listitem><para>If this option is enabled,
+-the windows will be fully repainted while dragging the frame
+-splitters. If unchecked, a so-called <quote>rubber band</quote> (indicating
+-the new size of the frame) will be used instead.</para></listitem>
++<term><anchor id="config-dialog-sessions-exit-behavior"/>
++<guilabel>Behavior on Application Exit or Session Switch</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Do not save session</guilabel></term>
++<listitem><para>The changes to the session data (open files and if enabled,
++window configuration) will not be saved. You will of course be prompted if you
++have unsaved files. With this option, your can configure your sessions once, and
++not worry about closing extra files that you opened and do not want to see
++next time you use the session.</para></listitem>
+ </varlistentry>
++<varlistentry>
++<term><guilabel>Save Session</guilabel></term>
++<listitem><para>&kate; will save session data, except if the session is unnamed.
++With this option, your sessions are allways restored just like you left them.
++This is the default behavior.
++</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Ask user</guilabel></term>
++<listitem><para>You will be asked if you want to save the session every time a
++named session is closed.</para></listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry><!-- /exit/switch behavior -->
+ 
++</variablelist>
++
++</sect2>
++
++<sect2 id="config-dialog-fileselector">
++<title>The <guilabel>Filesystem Browser</guilabel> Page</title>
++
++<variablelist>
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-general-sync-konsole"/>
+-<guibutton>Sync Konsole with Active Document</guibutton></term>
+-<listitem><para>This will cause the built-in &konsole; to
+-<command>cd</command> into the directory of the active document when
+-launched and when a new document gets the focus. If not enabled, you
+-have to do all your navigation in the &konsole; on your own.
++<term><guilabel>Toolbar</guilabel></term>
++<listitem><para>Configure the buttons on the file system browser toolbar
++by moving the ones you want enabled to the <guilabel>Selected Actions</guilabel>
++list, and order them using the arrow buttons at the side of the list.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guilabel>Auto Synchronization</guilabel></term>
++<listitem><para>You can have the filesystem browser automatically navigate to
++the directory containing the current document on certain events:
++<itemizedlist>
++<listitem><para>When a new document becomes the active one.</para></listitem>
++<listitem><para>When the filesystem browser becomes visible.</para></listitem>
++</itemizedlist>
++Even if you select not to use this feature, you can manually synchronize the
++browser with the current document by pressing the
++<guilabel>Synchronize</guilabel> toolbar button.
+ </para></listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guibutton>Number of Recent Files</guibutton></term>
+-<listitem><para>Unsurprisingly, this allows you to decide how long the
+-<guimenu>Open Recent</guimenu> files menu should grow.</para></listitem>
++<term><guilabel>Remember locations</guilabel></term>
++<listitem><para>Select how long a browsing history you want. The browser does
++only remember individual locations, duplicates are removed.</para></listitem>
+ </varlistentry>
+ 
++<varlistentry>
++<term><guilabel>Remember filters</guilabel></term>
++<listitem><para>Select how many filters you want remembered. Only individually
++distinct filters are remembered, duplicates are removed.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guilabel>Session</guilabel></term>
++<listitem>
++<para>Configure wether the file system browser should remember its location and
++filter over sessions.</para>
++</listitem>
++</varlistentry>
++
+ </variablelist>
+-</sect3>
+ 
+-<sect3 id="config-dialog-documentlist">
+-<title>The Doucment List Page</title>
+-<para>This page allows you to enable or disable the background shading
+-visualization of your recent activity, and chose which colors to use if enabled.
+-See the section about
+-<link linkend="kate-mdi-tools-file-list">The Document List</link> for more about
+-this feature.</para>
+-</sect3>
++</sect2>
+ 
+-<sect3 id="config-dialog-externaltools">
++<sect2 id="config-dialog-documentlist">
++<title>The <guilabel>Doucment List</guilabel> Page</title>
++
++<variablelist>
++<varlistentry>
++<term><guilabel>Backgound Shading</guilabel></term>
++<listitem><para>This section allows you to enable or disable the background
++shading visualization of your recent activity, and chose which colors to use if
++enabled. See the section about <link
++linkend="kate-mdi-tools-file-list">The Document List</link> for more about
++this feature.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Sort By</guilabel></term>
++<listitem><para>Set how you want the document list sorted. This can be set
++from the &RMB; menu in the document list as well.</para></listitem>
++</varlistentry>
++</variablelist>
++
++</sect2>
++
++<sect2 id="config-dialog-plugins">
++<title>The <guilabel>Plugins</guilabel> Page</title>
++
++<para>This page provides a list of installed plugins for the &kate;
++application. Each plug-in is represented with its name and a short description.
++You can check the checkbox with an item to enable the plug-in it represents.
++</para>
++
++<para>If a plug-in provides configuration options, a section to access those
++will appear as a child of this page.</para>
++
++</sect2>
++
++
++<sect2 id="config-dialog-externaltools">
+ <title>External Tools</title>
+ 
+ <para>In the <guimenu>Tools</guimenu> menu you will find a submenu labeled
+@@ -279,592 +435,881 @@
+ 
+ </variablelist>
+ 
+-</sect3>
+-
+ </sect2>
+ 
+-<sect2 id="config-dialog-editor">
+-<title>The Editor Group</title>
++</sect1>
++
++<sect1 id="config-dialog-editor">
++<title>The Editor Component Configuration</title>
+ <para>This group contains all pages related to the editor component of
+ &kate;. Most of the settings here are defaults, they can be overridden by
+ <link linkend="config-dialog-editor-filetypes">defining a filetype</link>,
+ by <link linkend="config-variables">Document Variables</link> or by changing
+ them pr. document during an editing session.</para>
+ 
+-<sect3 id="config-dialog-editor-colors">
+-<title>The <guilabel>Colors</guilabel> Page</title> <para>This page allows you
+-to change the background and selection background colors of the editor.
+-Initially, &kate; will use the colors as set in the &kcontrolcenter;
+-<menuchoice><guimenu>Look'n'Feel</guimenu><guimenuitem>Colors</guimenuitem>
+-</menuchoice>
+-page.</para>
+ 
+-<para>To change a color, press the associated button and select
+-the desired color in the color chooser.</para>
++<sect2 id="config-dialog-editor-appearance">
++<title>Appearance</title>
+ 
+-<note><para>Choosing the background color may render Syntax
+-Highlighted text unreadable.  You should use a light color for the
+-background, and a dark color for the selection background.
+-</para>
+-<para>Otherwise, you will probably need to change the <link linkend="config-dialog-editor-highlight-default-styles">Default Styles</link>.</para>
+-</note>
+-</sect3>
+-
+-<sect3 id="config-dialog-editor-fonts">
+-<title>The Fonts Page</title> <!-- FIXME LINKS //-->
+-
+-<para>This page allows you to choose the default fonts for &kate;. The
+-settings will be used for the &kwrite; and for viewing text files in
+-&konqueror; as well.</para>
+-
+-<para>The page presents two tabs, one for the editor font and one for
+-the printing font.  Select a tab and choose the desired font.  The
+-default is to use the &kde; global setting for fixed font.</para>
+-
+-<tip><para>As it is not currently possible to use individual fonts for
+-documents, nor to change the font for printing from the print dialog,
+-be careful. A fixed-width font is strongly recommended.  </para></tip>
+-</sect3>
+-
+-<sect3 id="config-dialog-editor-indent">
+-<title>The Indent Page</title>
+-<para>This page allows you to change the behavior of indentation.</para>
+-
+ <variablelist>
+-<title>Indent Options</title>
+-
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-indent-auto-indent" />
+-<guibutton>Auto indent</guibutton>
+-</term>
++<term><guilabel>Word Wrap</guilabel></term>
+ <listitem>
+-<para>If checked, &kate; will automatically indent new lines equal to
+-the previous line.  If the previous line is blank, the nearest above
+-line with contents is used.</para>
++<variablelist>
++<varlistentry id="appearance-settings">
++<term><guilabel>Dynamic word wrap</guilabel></term>
++<listitem><para>If this option is checked, the text lines
++will be wrapped at the view border on the screen.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Dynamic word wrap indicators</guilabel></term>
++<listitem><para>Choose when the Dynamic word wrap indicators
++should be displayed.
++</para></listitem></varlistentry>
++<varlistentry>
++<term><guilabel>Vertically align dynamically wrapped lines
++to indentation depth:
++</guilabel></term>
++<listitem><para>Enables the start of dynamically wrapped
++lines to be aligned  vertically to the indentation level of the first
++line.  This can help to make code and markup more
++readable.</para><para>Additionally, this allows you to
++set a maximum width of the screen, as a percentage,
++after which dynamically wrapped lines will no longer be vertically aligned.
++For example, at 50%, lines whose indentation levels are deeper than 50% of the
++width of the screen will not have vertical alignment applied to subsequent
++wrapped lines.</para></listitem>
++</varlistentry>
++</variablelist>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-indent-indent-with-spaces" />
+-<guibutton>Indent with Spaces</guibutton>
+-</term>
++<term><guilabel>Code Folding</guilabel></term>
+ <listitem>
+-<para>If checked, &kate; will indent with spaces rather than tabs.</para>
++<variablelist>
++<varlistentry>
++<term><guilabel>Show folding markers (if available)
++</guilabel></term>
++<listitem><para>If this option is checked, the current view will display marks
++for code folding, if code folding is available.</para></listitem>
++</varlistentry>
++</variablelist>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-indent-backspace-key-indents" />
+-<guibutton>Backspace key indents</guibutton>
+-</term>
++<term><guilabel>Borders</guilabel></term>
+ <listitem>
+-<para>If this is checked, &kate; will unindent equal to the nearest
+-above line with contents when you press the <keycap>Backspace</keycap>
+-key if the part of the line preceding the cursor contains only
+-whitespace.</para>
++<variablelist>
++<varlistentry>
++<term><guilabel>Show icon border
++</guilabel></term>
++<listitem><para>If this is checked, you will see an icon border on the left
++hand side. The icon border shows bookmark signs for instance.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Show line numbers
++</guilabel></term>
++<listitem><para>If this is checked, you will see line numbers on the left
++hand side.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Show scrollbar marks
++</guilabel></term>
++<listitem><para>If this option is checked the current view
++will show marks on the vertical scrollbar. These marks will
++for instance show bookmarks.</para></listitem>
++</varlistentry>
++</variablelist>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-indent-tab-key-indents" />
+-<guibutton>Tab key indents</guibutton>
+-</term>
+-<listitem>
+-<para>If this is checked, &kate; will indent the current line equal to
+-the nearest above line with content when you press the
+-<keycap>Tab</keycap> key, if the part of the line preceding the cursor
+-contains only whitespace.</para>
+-</listitem>
++<term><guilabel>Sort Bookmarks Menu
++</guilabel></term>
++<listitem><para>
++<variablelist>
++<varlistentry>
++<term><guilabel>By position
++</guilabel></term>
++<listitem><para>The bookmarks will be ordered by the line
++numbers they are placed at.</para></listitem>
+ </varlistentry>
++<varlistentry>
++<term><guilabel>By creation
++</guilabel></term>
++<listitem><para>Each new bookmark will be added to the bottom,
++independently from where it is placed in the document.</para></listitem>
++</varlistentry>
++</variablelist>
++</para></listitem>
++</varlistentry>
+ 
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-indent-keep-extra-spaces" />
+-<guibutton>Keep extra spaces</guibutton>
+-</term>
+-<listitem>
+-<para>With this behavior checked, &kate; will leave whitespace behind
+-the cursor after indenting.</para>
+-</listitem>
++<term><guilabel>Show identation lines
++</guilabel></term>
++<listitem><para>If this is checked, the editor wil display
++vertical lines to help identifying indent lines.</para></listitem>
+ </varlistentry>
+-
+ </variablelist>
++</sect2>
+ 
+-</sect3>
++<sect2 id="config-dialog-editor-colors">
++<title>Fonts &amp; Colors</title>
+ 
+-<sect3 id="config-dialog-editor-select">
+-<title>The Select Page</title>
++<para>This section of the dialog lets you configure all fonts and colors in
++any color scheme you have, as well creating new schemes or deleting existing
++ones. Each scheme has settings for colors, fonts and normal and highlight text
++styles.
++</para>
+ 
+-<para>This page provides options for fine tuning the select behavior
+-of &kate;</para>
++<para>&kate; will preselect the currently active scheme for you, if you want to
++work on a different scheme start by selecting that from the
++<guilabel>Schema</guilabel> combobox.</para>
+ 
++<sect3 id="config-dialog-editor-colors-colors">
++<title>Colors</title>
++
+ <variablelist>
+-<title>Select Options</title>
++<varlistentry id="config-dialog-editor-colors-colors-text-background">
++<term><guilabel>Text Area Background</guilabel></term>
++<listitem>
+ 
+-<varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-select-persistent-selections" />
+-<guibutton>Persistent Selections</guibutton>
+-</term>
+-<listitem>
+-<para>When Persistent Selections is enabled, key input will not cause
+-the selection to be removed/diminished.</para>
+-<note><para>This option
+-partly conflicts with the Overwrite Selection option. If both are
+-enabled, pasting text or pressing any other keys than the arrow keys
+-will cause the selection to be overwritten.</para></note>
++<variablelist>
++
++<varlistentry id="config-dialog-editor-colors-normal-text">
++<term><guilabel>Normal text</guilabel></term>
++<listitem><para>This is the default background for the editor area, it will be
++the dominant color on the editor area.</para></listitem>
++</varlistentry>
++
++<varlistentry id="config-dialog-editor-colors-selected-text">
++<term><guilabel>Selected Text</guilabel></term>
++<listitem><para>This is the background for selected text. The default is
++the global selection color, as set in your &kde; color preferences.
++</para></listitem>
++</varlistentry>
++
++<varlistentry id="config-dialog-editor-colors-current-line">
++<term><guilabel>Current Line</guilabel></term>
++<listitem><para>Set the color for the current line. Setting this a bit different
++from the Normal text background helps to keep focus on the current line.
++</para></listitem>
++</varlistentry>
++
++<varlistentry id="config-dialog-editor-colors-marks">
++<term><guilabel>Bookmark</guilabel></term>
++<listitem><para>This combo lets you set overlay colors for various mark types.
++The color is mixed into the background color of a marked line, so that a line
++with more marks or a marked line that is current has a background that is a mix
++of more colors. The mark colors are also used if you enable display of scrollbar
++marks.</para></listitem>
++</varlistentry>
++
++</variablelist>
+ </listitem>
+ </varlistentry>
+ 
++<varlistentry id="config-dialog-editor-colors-colors-other-elements">
++<term><guilabel>Other Elements</guilabel></term>
++<listitem>
++<variablelist>
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-select-overwrite-selections" />
+-<guibutton>Overwrite Selection</guibutton>
+-</term>
+-<listitem>
+-<para>If this is enabled, any text insertion, whether typed or pasted will cause the selected
+-text to be deleted and replaced with the inserted text.</para>
++<term><guilabel>Left Border Background</guilabel></term>
++<listitem><para>This color is used for the marks, line numbers and folding
++marker borders in the left side of the editor view when they are displayed.
++</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Line Numbers</guilabel></term>
++<listitem><para>This color is used to draw the line numbers on the left side of
++the view when displayed.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Bracket Highlight</guilabel></term>
++<listitem><para>This color is used to draw the background of matching brackets.
++</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Word Wrap Markers</guilabel></term>
++<listitem><para>This color is used to draw a pattern to the left of dynamically
++wrapped lines when those are aligned vertically, as well as for the static word
++wrap marker.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Tab Markers</guilabel></term>
++<listitem><para>This color is used to draw white space indicators when enabled.
++</para></listitem>
++</varlistentry>
++</variablelist>
+ </listitem>
+ </varlistentry>
+ 
+ </variablelist>
++</sect3>
+ 
++<sect3 id="config-dialog-editor-colors-fonts">
++<title>Fonts</title>
++<para>
++Here you can choose the font for the schema.  You can choose from
++any font available on your system, and set a default size. A sample text
++displays at the bottom of the dialog, so you can see the effect of your choices.
++</para>
+ </sect3>
+ 
+-<sect3 id="config-dialog-editor-edit">
+-<title>The Edit Page</title>
+-<para>This page contains miscellaneous options for fine-tuning the behavior of the &kate;
+-editor component.</para>
++<sect3 id="config-dialog-editor-colors-normal-text-styles">
++<title>Normal Text Styles</title>
++<para>The normal text styles are inherited by the highlight text styles,
++allowing the editor to present text in a very consistent way, for example comment
++text is using the same style in allmost all of the text formats that kate can
++highlight.</para>
++<para>The name in the list of styles is using the style configured for
++the item, providing you with an immediate preview when configuring a style.
++</para>
++<para>Each style lets you select common attributes as well as foreground
++and background colors. To unset a background color, rightclick to use the
++context menu.</para>
++</sect3>
+ 
++<sect3 id="config-dialog-editor-colors-highlighting-text-styles">
++<title>Highlighting Text Styles</title>
++<para>Here you can edit the text styles used by a specific highlight definition.
++The editor preselects the highlight used by your current document. To work on a
++different highlight, select one in the <guilabel>Highlight</guilabel> combobox
++above the style list.
++</para>
++<para>The name in the list of styles is using the style configured for
++the item, providing you with an immediate preview when configuring a style.
++</para>
++<para>Each style lets you select common attributes as well as foreground
++and background colors. To unset a background color, rightclick to use the
++context menu. In addition you can see if a style is equal to the default style
++used for the item, and set it to that if not.</para>
++<para>You will notice that many highlights contain other highlights represented
++by groups in the style list. For example most highlights import the Alert
++highlight, and many source code formats imports the Doxygen highlight. Editing
++colors in those groups only affects the styles when used in the edited highlight
++format.
++</para>
++</sect3>
++
++</sect2>
++
++<sect2 id="config-dialog-editor-cursor-selection">
++<title>Cursor &amp; Selection</title>
++
+ <variablelist>
+-<title>Editor Options</title>
+ 
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-edit-word-wrap" />
+-<guibutton>Word Wrap</guibutton>
+-</term>
++<term><guilabel>Text Cursor Movement</guilabel></term>
+ <listitem>
+-<para>Word Wrap as used here means dynamically format the text by breaking lines at an appropriate
+-place, rather than soft wrapping lines in the editor for easier reading.</para>
+-<para>If enabled, &kate; will insert a line break as defined by the <link linkend="document-end-of-line">End of Line</link>
+-setting for the document when the line extends the length set in
+-<link linkend="config-dialog-editor-edit-wrap-words-at">Wrap Words At</link> option described below.</para>
+-</listitem>
+-</varlistentry>
+-
++<variablelist>
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-edit-wrap-words-at" />
+-<guibutton>Wrap Words At</guibutton>
+-</term>
++<term><guilabel>Smart home</guilabel></term>
+ <listitem>
+-<para>This option decides the max length of lines if the
+-<link linkend="config-dialog-editor-edit-word-wrap">Word Wrap</link> option is enabled.</para>
++<para>When selected, pressing the home key will cause the cursor to
++skip white space and go to the start of a line's text.</para>
+ </listitem>
+ </varlistentry>
+-
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-edit-replace-tabs-with-spaces" />
+-<guibutton>Replace Tabs with Spaces</guibutton>
+-</term>
++<term><guilabel>Wrap cursor</guilabel></term>
+ <listitem>
+-<para>If enabled, &kate; will replace inserted <keycap>Tab</keycap>
+-characters with a number of single whitespace characters as defined in
+-<link linkend="config-dialog-editor-edit-tab-indent-width">Tab
+-Width</link>.</para>
++<para>When on, moving the insertion cursor using the <emphasis
++role="bold">Left</emphasis> and <emphasis role="bold">Right</emphasis> keys will
++go on to previous/next line at beginning/end of the line, similar to most
++editors.</para><para>When off, the insertion cursor cannot be moved left of the
++line start, but it can be moved off the line end, which can be very handy for
++programmers. When this option is chosen, moving the cursor with the arrow keys
++off the end of a line (to the right) causes it to jump down to the beginning of
++the next line. Likewise when the cursor is moved past the beginning of a line
++(to the left) it jumps up to the end of the preceding line. When this option is
++not selected, moving the cursor right past the end of a line merely causes it to
++continue horizontally in the same line and trying to move it left past the
++beginning does nothing.</para>
+ </listitem>
+ </varlistentry>
+-
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-edit-remove-trailing-spaces" />
+-<guibutton>Remove trailing spaces</guibutton>
+-</term>
++<term><guilabel>Page Up/Page Down moves cursor</guilabel></term>
+ <listitem>
+-<para>If enabled, &kate; will remove any whitespace at the rear end of
+-a line each time the cursor is moved off that line.</para>
++<para>This option changes the behavior of the cursor when the user presses
++the <keycap>Page Up</keycap> or <keycap>Page Down</keycap> key. If unselected
++the text cursor will maintain its relative position within the visible text in
++&kate; as new text becomes visible as a result of the operation.  So if the
++cursor is in the middle of the visible text when the operation occurs it will
++remain there (except when one reaches the beginning or end.)  With this option
++selected, the first key press will cause the cursor to move to either the top or
++bottom of the visible text as a new page of text is displayed.</para>
+ </listitem>
+ </varlistentry>
+-
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-edit-tab-indent-width" />
+-<guibutton>Tab/Indent Width</guibutton>
+-</term>
++<term><guilabel>Autocenter cursor (lines):</guilabel></term>
+ <listitem>
+-<para>Sets the tab width, which is also used to decide the amount of indentation when
+-<link linkend="config-dialog-editor-indent-auto-indent">Auto Indent</link> is enabled, or
+-indentation is otherwise called for.</para>
+-<para>Depending on the <link linkend="config-dialog-editor-indent">Indent</link> settings indentation may be caused
+-by pressing the <keycap>Tab</keycap> and <keycap>Backspace</keycap> keys, and activating the
+-<link linkend="edit-indent"><guimenu>Edit</guimenu> <guimenuitem>Indent</guimenuitem></link>
+-menu entry will call for indent as well.</para>
++<para>Sets the number of lines to maintain visible above and below the cursor
++when possible.</para>
+ </listitem>
+ </varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-edit-auto-brackets" />
+-<guibutton>Auto Brackets</guibutton>
+-</term>
++<term><guilabel>Selection Mode</guilabel></term>
+ <listitem>
+-<para>If this is enabled, &kate; will automatically insert a right bracket immediately to the
+-right of the cursor when a left bracket is inserted from the keyboard. The supported bracket types
+-are <keycap>(</keycap>, <keycap>{</keycap>, <keycap>[</keycap>and <keycap>&lt;</keycap></para>
++<variablelist>
++<varlistentry>
++<term><guilabel>Normal</guilabel></term>
++<listitem>
++<para>Selections will be overwritten by typed text and will be lost on
++cursor movement.</para>
+ </listitem>
+ </varlistentry>
+-
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-edit-group-undos" />
+-<guibutton>Group undos</guibutton>
+-</term>
++<term><guilabel>Persistent</guilabel></term>
+ <listitem>
+-<para>If enabled, &kate; will group any number of similar editing
+-actions (for example typing, backspacing, pasting) in one entry in the
+-undo history, so they can all be undone at once.</para>
++<para>Selections will stay even after cursor movement and typing.</para>
+ </listitem>
+ </varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
++</variablelist>
++</sect2>
+ 
++<sect2 id="config-dialog-editor-edit">
++<title>Editing</title>
++<variablelist>
++
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-edit-show-tabs" />
+-<guibutton>Show Tabs</guibutton>
+-</term>
++<term><guilabel>Tabulators</guilabel></term>
+ <listitem>
+-<para>If enabled, &kate; will draw a small dot at the start of a
+-<keycap>Tab</keycap> character in the editor to indicate its
+-presence.</para>
++<variablelist>
++<varlistentry>
++<term><guilabel>Insert spaces instead of tabulators</guilabel></term>
++<listitem>
++<para>When this is enabled the editor will insert a calculated number of spaces
++according to the position in the text and the <option>tab-width</option> setting
++when you press the <keycap>TAB</keycap> key.</para>
+ </listitem>
+ </varlistentry>
+-
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-edit-smart-home" />
+-<guibutton>Smart Home</guibutton>
+-</term>
++<term><guilabel>Show tabulators</guilabel></term>
+ <listitem>
+-<para>This will make &kate; move the cursor to the first
+-non-whitespace character of the current line rather than to the
+-absolute beginning, when the <keycap>Home</keycap> key (or other key
+-assigned to that function) is pressed.</para>
++<para>When this is enabled &kate; will display a small dot as a visual
++representation of tabulator characters.</para>
++<note><para>This also causes dots to be drawn to indicate trailing white space.
++This will be fixed in a future version of &kate;</para></note>
+ </listitem>
+ </varlistentry>
++<varlistentry>
++<term id="config-dialog-editor-tab-width">Tab Width</term> <listitem><para>If the
++<link  linkend="config-dialog-editor-word-wrap"><guilabel>Replace Tabs By
++Spaces</guilabel></link>
++option is selected this entry determines the number of
++spaces with which the editor will automatically replace
++tabs.</para></listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
+-<!-- NOTE This option has gone (anders)
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-edit-page-up-down-moves-cursor" />
+-<guibutton>Page Up/Down moves cursor</guibutton>
+-</term>
++<term id="config-dialog-editor-word-wrap"><guilabel>Static Word Wrap</guilabel></term>
++<listitem><para>
++Word wrap is a feature that causes the editor to automatically start a new line
++of text and move (wrap) the cursor to the beginning of that new line.  &kate;
++will automatically start a new line of text when  the current line reaches the
++length specified by the <link linkend="config-dialog-editor-wrap-words-at">Wrap Words
++At:</link> option.</para>
++<variablelist>
++<varlistentry>
++<term><guilabel>Enable static word wrap</guilabel></term>
+ <listitem>
+-<para>If enabled, the cursor will be moved to the first/last visible
+-line when <keycap>Page Up</keycap>/<keycap>Page Down</keycap> (or
+-other key assigned to those functions) is pressed, rather than being
+-kept at its relative position.</para>
++<para>Turns static word wrap on or off.</para>
+ </listitem>
+ </varlistentry>
+--->
+ <varlistentry>
+-<term>
+-<anchor id="config-dialog-editor-edit-wrap-cursor" />
+-<guibutton>Wrap Cursor</guibutton>
+-</term>
++<term><guilabel>Show static word wrap markers
++(if applicable)</guilabel></term>
+ <listitem>
+-<para>If enabled, moving the cursor past the end of a line will cause
+-it to continue to the next/previous line if any.</para>
+-<para>If not enabled, the cursor cannot be moved right of the
+-beginning of the line, but it may be moved past the end of line, and
+-when text is inserted &kate; will automatically insert whitespace up
+-to that position. This is sometimes very handy for programmers, for
+-example.</para>
++<para>If this option is checked, a vertical line will be drawn at the word wrap
++column as defined in the <menuchoice> <guimenu>Settings</guimenu>
++<guimenuitem>Configure Editor...</guimenuitem></menuchoice> in the Editing tab.
++Please note that the word wrap marker is only drawn if you use a fixed pitch
++font.</para>
+ </listitem>
+ </varlistentry>
+-
++<varlistentry id="config-dialog-editor-wrap-words-at">
++<term><guilabel>Wrap words at:</guilabel></term>
++<listitem>
++<para>If the <link linkend="config-dialog-editor-word-wrap">Word Wrap</link> option is selected
++this entry  determines the length (in characters) at which the editor will
++automatically start a new line.</para>
++</listitem>
++</varlistentry>
+ </variablelist>
++</listitem>
++</varlistentry>
+ 
+-</sect3>
++<varlistentry>
++<term><guilabel>Remove Trailing Spaces</guilabel></term>
++<listitem><para>&kate; will automatically eliminate extra spaces
++at the ends of lines of text.</para></listitem> </varlistentry>
+ 
+-<sect3 id="config-dialog-editor-keyboard">
+-<title>The Keyboard Page</title>
++<varlistentry>
++<term><guilabel>Auto Brackets</guilabel></term> <listitem><para>When
++the user types a left bracket ([, (, or {) &kate; automatically enters the
++right bracket (}, ), or ]) to the right of the cursor.</para></listitem>
++</varlistentry>
+ 
+-<para>Here you can configure the keyboard shortcuts for the internal
+-commands of the &kate; editor component. These includes commands for
+-moving around in the document and selecting text. For keys related to
+-copying and pasting text, see <!-- link linkend="" -->The Configure
+-Keys Dialog<!-- /link --></para>
++<varlistentry> <term>Maximum <link linkend="undo">undo</link> steps:</term>
++<listitem><para>Here the user may specify the number of steps &kate; will
++retain in memory for purposes of undoing entries and actions. This means that
++the higher the number of steps set the more memory &kate; will use for this.
++Setting  this entry to 10 would mean that the user would be be able reverse the
++last ten operations, <abbrev>i.e.</abbrev> click the <guibutton>undo</guibutton>
++button 10 times and obtain results.</para></listitem> </varlistentry>
+ 
+-<para>You may change the keys for a command, or add an alternate
+-key.</para>
++<varlistentry> <term>Smart search text from:</term>
++<listitem><para>This determines where &kate; will get the search
++text from (this will be automatically entered into the Find Text
++dialog):
++<itemizedlist>
++<listitem><para><emphasis role="bold">Nowhere:</emphasis> Don't guess the search
++text.</para></listitem>
++<listitem><para><emphasis role="bold">Selection Only:</emphasis> Use
++    the current text selection, if available. </para></listitem>
++<listitem><para><emphasis role="bold">Selection, then Current Word:</emphasis>
++Use the current selection if available, otherwise use the current word.
++</para></listitem>
++<listitem><para><emphasis role="bold">Current Word
++Only:</emphasis> Use the word that    the cursor is currently resting on, if
++available. </para></listitem>
++<listitem><para><emphasis role="bold">Current Word, then Selection:</emphasis>
++Use the current word if    available, otherwise use the current selection.
++</para></listitem>
++</itemizedlist>
++Note that, in all the above modes, if a
++search string has not been or cannot be determined, then the Find Text Dialog
++will fall back to the last search text.
++</para></listitem>
++</varlistentry>
++</variablelist>
++</sect2>
+ 
+-<procedure>
+-<title>To change the key(s) for a command, follow this procedure:</title>
+-<step>
+-<para>Select the command for which you want to configure the keys.</para>
+-</step>
+-<step>
+-<para>Choose the <guibutton>None</guibutton> option in the pane below the list if you don't want a
+-key for this command.</para>
+-<para>Choose the <guibutton>Default</guibutton> option to use the default key(s) for the
+-command</para>
+-<para>Choose the <guibutton>Custom</guibutton> option to select a custom key for the command,
+-or set an alternate one.</para>
+-</step>
+-<step>
+-<para>If you choose the <guibutton>Custom</guibutton> option, the key
+-entering button at the right of the pane will be enabled. To set a
+-key, press it. The &kde; Define Shortcut Dialog will appear. In this
+-dialog:</para>
+-</step>
+-<step>
+-<procedure>
+-<step>
+-<para>Choose whether to set the default or alternate
+-key. <guilabel>Default</guilabel> does not mean that you change the
+-application default for this action, rather it sets the custom
+-standard key for it.</para>
+-</step>
+-<step>
+-<para>Press the desired key sequence, it will be visualized for you in
+-the dialog for your confirmation. </para>
+-
+-<para>If you are of an adventurous nature, try playing around with the
+-<guibutton>Multikey</guibutton> option. Using it will allow you to
+-have &Emacs;-like key sequences (one key enters a group, the next
+-performs the action), apart from the fact that instead of just doing
+-the job, &kde; will pop up a menu to choose from in an undefined and
+-most likely inappropriate place. You will now be in no doubt as to
+-whether pressing the next key in the sequence will work, or you have
+-to type the menu accelerator (both will work).</para>
+-</step>
+-</procedure>
+-</step>
+-</procedure>
+-</sect3>
+-
+-<sect3 id="config-dialog-editor-filetypes">
+-<title>The Filetypes Page</title>
+-
+-<para>This page allow you to override the default configuration for documents
+-of specified mimetypes. When the editor loads a document, it will try if
+-it matches the file masks or mimetypes for one of the defined filetypes, and
+-if so apply the variables defined. If more filetypes matches, the one with the
+-highest priority will be used. Please see the section
+-<link linkend="config-variables">Configuring With Document Variables</link>
+-for how to specify variables.</para>
+-
+-<para>To create a filetype, press the <guibutton>New</guibutton> button and
+-fill in the properties.</para>
+-
+-<para>To remove an existing filetype, select it from the dropdown list and
+-press the <guibutton>Delete</guibutton>
+-button.</para>
+-
+-<para>To edit an existing filetype, select it from the dropdown list.</para>
+-
++<sect2 id="config-dialog-editor-indent">
++<title>Indentation</title>
+ <variablelist>
+-
+-<title>Filetype Properties</title>
+-
+ <varlistentry>
+-<term>Name</term>
+-<listitem><para>This is a friendly name that can be displayed in the
+-<menuchoice><guisubmenu>Tools</guisubmenu><guisubmenu>Filetypes</guisubmenu></menuchoice>
+-menu.</para></listitem>
++<term><guilabel>Automatic indentation</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Indentation mode:</guilabel></term>
++<listitem>
++<para>Select the automatic indentation mode you want to use as default. It is
++strongly recommended to use <userinput>None</userinput> or
++<userinput>Normal</userinput>here, and use filetype configurations to set other
++indentation modes for text formats like C/C++ code or &XML;.</para>
++</listitem>
+ </varlistentry>
++<varlistentry>
++<term><guilabel>Insert leading Doxygen "*" when typing</guilabel></term>
++<listitem>
++<para>Automatically insert a leading "*" while typing within a doxygen
++style comment. This setting is only enabled when applicable.</para>
++</listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
+ <varlistentry>
+-<term>Section</term>
+-<listitem><para>A submenu of
+-<menuchoice><guisubmenu>Tools</guisubmenu><guisubmenu>Filetypes</guisubmenu></menuchoice>
+-in which to place this filetype. If the section does not already exist, it will
+-be created for you.</para></listitem>
++<term><guilabel>Indentation with Spaces</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Use spaces instead of tabs to indent</guilabel></term>
++<listitem>
++<para>This  replaces tabs with the number of spaces set in <guilabel>Number of
++spaces:</guilabel> below.</para>
++</listitem>
+ </varlistentry>
++<varlistentry>
++<term><guilabel>Emacs style mixed mode</guilabel></term>
++<listitem>
++<para>Use a mix of tabs and space characters for indentation.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Number of spaces:</guilabel></term>
++<listitem>
++<para>Set the number of spaces you want to use for indentation when you
++check <guilabel>Use spaces instead of tabs to indent</guilabel>
++above.</para>
++</listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
+ <varlistentry>
+-<term>Variables</term>
+-<listitem><para>This is where the actual configuration goes. Variables set here
+-will overwrite the default configuration values. Please refer to
+-<link linkend="config-variables">Configuring With Document Variables</link>
+-for the available variables.</para></listitem>
++<term><guilabel>Keep Indent Profile</guilabel></term>
++<listitem><para>When this is enabled, the editor will not unindent lines in a
++selection further when the line with the least indentation becomes unindented.
++If you sometimes unindent blocks of indented code, this may be helpful.
++</para></listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term>File Extensions</term>
+-<listitem><para>A semicolon separated list of filename globs used to determine
+-if a document matches this filetype.</para></listitem>
++<term><guilabel>Keep Extra Spaces</guilabel></term>
++<listitem><para>Indentations of more than the selected number of spaces
++will not be shortened.</para></listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term>Mimetypes</term>
+-<listitem><para>A semicolon separated list of mime types, used to determine if
+-a document matches this filetype.</para></listitem>
++<term><guilabel>Keys to use</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Tab key indents</guilabel></term>
++<listitem>
++<para>This  allows the <keycombo
++action="simul"><keycap>tab</keycap></keycombo> key to be used to indent.</para>
++</listitem>
+ </varlistentry>
++<varlistentry>
++<term><guilabel>Backspace key indent</guilabel></term>
++<listitem>
++<para>This allows the <keycombo
++action="simul"><keycap>backspace</keycap></keycombo> key to be used to
++indent.</para>
++</listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
+ <varlistentry>
+-<term>Priority</term>
+-<listitem><para>If a document matches several filetypes, the one with the highest
+-priority will be chosen.</para></listitem>
++<term><guilabel>Tab Key Mode if Nothing Selected</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Insert indent characters</guilabel></term>
++<listitem>
++<para>This allows the <keycombo
++action="simul"><keycap>Tab</keycap></keycombo> key insert indent
++characters.</para>
++</listitem>
+ </varlistentry>
++<varlistentry>
++<term><guilabel>Insert tab character</guilabel></term>
++<listitem>
++<para>This allows the <keycombo
++action="simul"><keycap>Tab</keycap></keycombo> key insert a tab.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Indent current line</guilabel></term>
++<listitem>
++<para>This allows the <keycombo
++action="simul"><keycap>Tab</keycap></keycombo> key indent the current
++line.</para>
++</listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
+ </variablelist>
++</sect2>
+ 
+-</sect3>
++<sect2 id="config-dialog-editor-open-save">
++<title>Open &amp; Save</title>
+ 
+-<sect3 id="config-dialog-editor-spelling">
+-<title>The Spelling Page</title>
+-<para>This page allows you to configure how &kspell; behaves with &kate;</para>
+-</sect3>
+-
+-<sect3 id="config-dialog-editor-hl">
+-<title>The Highlighting Page</title>
+-
+-<para>This page allows you to fine tune the color and syntax type selection of &kate;</para>
+-<para>
+-<mediaobject>
+-<imageobject><imagedata format="PNG" fileref="configdialog02.png" /></imageobject>
+-</mediaobject>
+-</para>
+-<para>For more in depth information on the syntax highlighting system, see ??</para>
+-
+-<para>The page consists of two tabs, one for setting the
+-<guibutton>Default styles</guibutton> and one for managing the
+-<guibutton>Highlight Modes</guibutton>. Both tabs display a list of
+-contexts in which the default colors and font are used to visualize
+-the look of each style.  The context name is painted using the current
+-properties of the context.</para>
+-
+-<para>The list has four or five columns, each with the following
+-purpose:</para>
+-
+ <variablelist>
+ 
+ <varlistentry>
+-<term>Context</term>
+-<listitem><para>Displays the context name, painted using the style
+-properties for the context.</para></listitem>
++<term><guilabel>File Format</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Encoding:</guilabel></term>
++<listitem>
++<para>This sets the default character encoding for your files.</para>
++</listitem>
+ </varlistentry>
+-
+ <varlistentry>
+-<term>Bold</term>
+-<listitem><para>The state of this checkbox decides if the context should be
+-rendered using a boldface
+-font.</para></listitem>
++<term><guilabel>End of line:</guilabel></term>
++<listitem>
++<para>Choose your prefered end of line mode for your active
++document. You have the choice between &UNIX;, DOS/&Windows; or Macintosh.</para>
++</listitem>
+ </varlistentry>
++<varlistentry>
++<term><guilabel>Automatic end of line detection</guilabel></term>
++<listitem>
++<para>Check this if you want the editor to autodetect the end of line
++type. The first found end of line type will be used for the whole file.</para>
++</listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
+ <varlistentry>
+-<term>Italic</term>
+-<listitem><para>The state of this checkbox decides if the context should be rendered using italic
+-font.</para></listitem>
++<term><guilabel>Memory Usage</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Maximum loaded blocks per file:</guilabel></term>
++<listitem>
++<para>The editor will load given number of blocks (of around 2048 lines) of
++text into memory;  if the filesize is bigger than this the other blocks
++are swapped to disk and loaded transparently as-needed.</para>
++<para>This can cause little delays while navigating in the document; a
++larger block count increases the editing speed at the cost of memory.
++</para><para>For normal usage, just choose the highest possible block count:
++limit it only if you have problems with the memory usage.</para>
++</listitem>
+ </varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
+ <varlistentry>
+-<term>Normal</term>
+-<listitem><para>This button displays the color for drawing the style in normal mode, when the text
+-is not selected that is. To change the color, click the button.</para></listitem>
++<term><guilabel>Automatic Cleanups on Load/Save</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Remove trailing spaces</guilabel></term>
++<listitem>
++<para>The editor will automatically eliminate extra spaces at the ends of lines
++of text while loading/saving the file.</para>
++</listitem>
+ </varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
+ <varlistentry>
+-<term>Selected</term>
+-<listitem><para>This button displays the color for drawing the style when the text
+-is selected. To change the color, click the button.</para></listitem>
++<term><guilabel>Folder Config File</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Search depth for config file:</guilabel></term>
++<listitem>
++<para>The editor will search the given number of folder levels upwards
++for &kate; config file and load the settings line from it.</para>
++</listitem>
+ </varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
+ <varlistentry>
+-<term>Using Default</term>
+-<listitem><para>This checkbox, only available in the
+-<guibutton>Highlight Modes</guibutton> tab shows if the style is using
+-its default values. It will automatically become unchecked if you
+-change any properties of the style. Check it to reset a style to using
+-defaults.</para></listitem>
++<term><guilabel>Backup on Save</guilabel></term>
++<listitem><para>Backing up on save will cause &kate; to copy the disk file to
++&lt;prefix&gt;&lt;filename&gt;&lt;suffix&gt;' before saving changes.
++The suffix defaults to <emphasis role="bold">~</emphasis> and prefix is empty by
++default. </para>
++<variablelist>
++<varlistentry>
++<term><guilabel>Local files</guilabel></term>
++<listitem>
++<para>Check this if you want backups of local files when
++saving.</para>
++</listitem>
+ </varlistentry>
++<varlistentry>
++<term><guilabel>Remote files</guilabel></term>
++<listitem>
++<para>Check this if you want backups of remote files when saving.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Prefix</guilabel></term>
++<listitem>
++<para>Enter the prefix to prepend to the backup file names.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Suffix</guilabel></term>
++<listitem>
++<para>Enter the suffix to add to the backup file names.</para>
++</listitem>
++</varlistentry>
+ 
+ </variablelist>
++</listitem>
++</varlistentry>
+ 
+-<sect4 id="config-dialog-editor-highlight-default-styles">
+-<title>The Default Styles Tab</title>
+-<para>To change any of the default styles, set its properties as desired.</para>
+-</sect4>
++</variablelist>
++</sect2>
+ 
+-<sect4 id="config-dialog-editor-highlight-highlight-modes">
+-<title>The Highlight Modes Tab</title>
++<sect2 id="config-dialog-editor-highlighting">
++<title>Highlighting</title>
++<para>This group of options is used to customize the highlighting styles for
++each programming language type. Any changes you made in other areas of this
++dialog apply only to this type.</para>
+ 
+-<para><indexterm><primary>syntax highlighting, configuring</primary></indexterm>
+-Here you can change the most important properties of each
+-available highlight mode. First, use the
+-<guibutton>Highlight</guibutton> dropdown to choose a mode to work
+-on.</para> <para>Highlight modes are initially chosen based on the
+-&MIME; type and extension of the file. To change the list for the
+-current selection, edit the <guibutton>File Extensions</guibutton> and
+-<guibutton>Mime Types</guibutton> entries. Alternatively, press the
+-wizard button to the right of the <guibutton>Mime Types</guibutton>
+-entry. This will show a dialog displaying all available &MIME; types
+-to choose from. Using it will edit the &MIME; types as well as the
+-file extensions.</para>
++<variablelist>
++<varlistentry>
++<term><guilabel>Highlight:</guilabel></term>
++<listitem><para>This is used to choose the language type to
++configure.</para></listitem>
++</varlistentry>
+ 
+-<mediaobject>
+-<imageobject><imagedata format="PNG" fileref="mimetypechooser.png" /></imageobject>
+-</mediaobject>
++<varlistentry>
++<term><guilabel>Informations</guilabel></term>
++<listitem>
+ <para>
+-The &MIME; type chooser dialog displays a tree of available &MIME; types, with
+-a description and the patterns for the &MIME; type. To include a &MIME; type,
+-check the box beside it.
++View the properties of the chosen language highlighting rules:
++author name and license.
+ </para>
++</listitem>
++</varlistentry>
+ 
+-<para>You can change the style properties of any context as described
+-above.</para>
++<varlistentry>
++<term><guilabel>Properties</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>File extensions:</guilabel></term>
++<listitem><para>This is the list of file extensions used to determine which
++files to highlight using the current syntax highlight mode.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>MIME types:</guilabel></term>
++<listitem><para>Clicking the wizard button will display a dialog with a list of
++all available mime types to choose from.</para><para>The <emphasis
++role="bold">File Extensions</emphasis> entry will automatically be edited as
++well.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Priority:</guilabel></term>
++<listitem><para>Set the priority of the highlight rule.</para></listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
+-<para>At the bottom of the tab, below the highlight
+-properties, you see a button labeled
+-<guibutton>Download</guibutton>. Pressing it will attempt to connect
+-to the &kate; website and fetch a list of available syntax highlight
+-modes which you can update or add.</para>
++<varlistentry>
++<term><guibutton>Download...</guibutton></term>
++<listitem>
++<para>
++Click this button to download new or updated syntax highlight descriptions
++from the &kate; website.
++</para>
++</listitem>
++</varlistentry>
+ 
+-</sect4>
+-
+-</sect3>
+-
++</variablelist>
+ </sect2>
+ 
+-<sect2 id="config-dialog-plugins">
+-<title>The Plugins Group</title>
++<sect2 id="config-dialog-editor-filetypes">
++<title>Filetypes</title>
++<para>This page allows you to override the default configuration for documents
++of specified mimetypes. When the editor loads a document, it will try if it
++matches the file masks or mimetypes for one of the defined filetypes, and if so
++apply the variables defined. If more filetypes match, the one with the highest
++priority will be used.
++</para>
++<variablelist>
++<varlistentry>
++<term><guilabel>Filetype:</guilabel></term>
++<listitem><para>The filetype with the highest priority is the one displayed in
++the first drop down box. If more filetypes were found, they are
++also listed.</para>
++<variablelist>
++<varlistentry>
++<term><guilabel>New</guilabel></term>
++<listitem><para>This is used to create a new filetype. After
++you click on this button, the fields below get empty and you
++can fill the properties you want for the new filetype.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Delete</guilabel></term>
++<listitem><para>To remove an existing filetype, select it from the drop down
++box and press the Delete button.</para></listitem>
++</varlistentry>
++</variablelist>
++</listitem> </varlistentry>
+ 
+-<para><indexterm><primary>plugins, configuring</primary></indexterm>
+-This group contains pages related to plugins. Apart from the
+-Manager configuration page, some plugins provide individual
+-configuration options. For information on these, see the documentation
+-for the individual plugins.</para>
++<varlistentry>
++<term><guilabel>Properties of current filetype</guilabel></term>
++<listitem><para>The filetype with the highest priority is the one displayed in
++the first drop down box. If more filetypes were found, they are also
++listed.</para>
++<variablelist>
++<varlistentry>
++<term><guilabel>Name:</guilabel></term>
++<listitem><para>The name of the filetype will be the text of the corresponding
++menu item. This name is displayed in the
++<menuchoice><guimenu>Tools</guimenu><guimenuitem>Filetypes</guimenuitem>
++</menuchoice ></para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Section:</guilabel></term>
++<listitem><para>The section name is used to organize the file types in
++menus. This is also used in the
++<menuchoice><guimenu>Tools</guimenu><guimenuitem>Filetypes</guimenuitem>
++</menuchoice> menu.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Variables:</guilabel></term>
++<listitem><para>This string allows you to configure &kate;'s settings for the
++files selected by this mimetype using &kate; variables. You can set almost any
++configuration option, such as highlight, indent-mode, encoding,
++etc.</para><para>For a full list of known variables, see the
++manual.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>File extensions:</guilabel></term>
++<listitem><para>The wildcards mask allows you to select files by filename. A
++typical mask uses an asterisk and the file extension, for example
++<filename>*.txt; *.text</filename>. The string is a semicolon-separated list of
++masks.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>MIME types:</guilabel></term>
++<listitem><para>Displays a wizard that helps you easily select
++mimetypes.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Priority:</guilabel></term>
++<listitem><para>Sets a priority for this file type. If more than one file type
++selects the same file, the one with the highest priority will be
++used.</para></listitem>
++</varlistentry>
++</variablelist>
++</listitem> </varlistentry>
+ 
+-<sect3 id="config-dialog-plugins-manager">
+-<title>The Plugin Manager Page</title>
++</variablelist>
++</sect2>
+ 
+-<para>This page provides the means of loading/unloading plugins, and
+-minimal information about individual plugins.</para>
++<sect2 id="config-dialog-editor-shortcuts">
++<title>Shortcuts</title>
++<para>You can change here the shortcut keys configuration. Select an
++action and click on <guilabel>Custom</guilabel> if you want a different shortcut
++for this action.</para>
++<para>The search line alllows you to look for a specific action and see
++its associated shortcut.</para>
++</sect2>
+ 
+-<para>To load an unloaded plugin, select it in the <guibutton>Available
+-Plugins</guibutton> pane and use the arrow buttons to move it to the
+-<guibutton>Loaded Plugins</guibutton> pane.</para>
++<sect2 id="config-dialog-editor-plugins">
++<title>Plugins</title>
++<para>This tab lists all available plugins and you can check those you
++want to use. Once a plugin is checked, the
++<guibutton>Configure</guibutton> button is enabled and you can click it
++in order to configure the highlighted plugin.</para>
++</sect2>
+ 
+-<para>To unload a loaded plugin, select it in the <guibutton>Loaded
+-Plugins</guibutton> pane and use the arrow buttons to move it to the
+-<guibutton>Available buttons</guibutton> pane.</para>
++</sect1>
+ 
+-<para>To view a minimal description and information about a plugin,
+-select it and the information will be available below the
+-lists.</para>
+-</sect3>
+ 
+-</sect2>
+ 
+-</sect1>
+-
+ <sect1 id="config-variables">
+ 
+ <title>Configuring With Document Variables</title>
+--- doc/kate/fundamentals.docbook	(revision 488815)
++++ doc/kate/fundamentals.docbook	(revision 494868)
+@@ -29,7 +29,8 @@
+ Open the &kde; program menu by clicking on the
+ <guiicon>big K</guiicon> icon on the toolbar at the bottom left of your
+ screen. This will raise the <guimenu>program menu</guimenu>. Move your
+-cursor up the menu to the <guimenu>Editors</guimenu> menu item. A list
++cursor up the menu to the <menuchoice><guimenu>Utilities</guimenu>
++<guimenuitem>Editors</guimenuitem></menuchoice> menu item. A list
+ of available editors will appear. Choose
+ <guimenuitem>&kate;</guimenuitem>.
+ </para>
+@@ -105,6 +106,73 @@
+ 
+ <varlistentry>
+ <term><userinput><command>kate</command>
++<option>-s</option> <option>--start</option> <parameter>name</parameter></userinput></term>
++<listitem>
++<para>
++Starts kate with the session <parameter>name</parameter>. The session is created
++if it does not exist already.
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><userinput><command>kate</command>
++<option>-u</option> <option>--use</option> <parameter>URL</parameter></userinput></term>
++<listitem>
++<para>
++Causes &kate; to use and existing instance if there is one. If you want all
++documents to open in one kate instance, you can add this option to the default
++command in your kde application configuration, as well as create a shell alias
++in your command intepreter if it supports that.
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><userinput><command>kate</command>
++<option>-p</option> <option>--pid</option> <parameter>PID</parameter></userinput></term>
++<listitem>
++<para>
++Only reuses an instance with the specified PID (Process ID). Used with the
++<option>--use</option> option.
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><userinput><command>kate</command>
++<option>--encoding</option> <parameter>encoding</parameter>
++<parameter>URL</parameter></userinput></term>
++<listitem><para>Uses the specified encoding for the document.
++</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><userinput><command>kate</command>
++<option>--line</option> <parameter>line</parameter>
++<parameter>URL</parameter></userinput></term>
++<listitem><para>Navigates to the specified line after opening the document.
++</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><userinput><command>kate</command>
++<option>--column</option> <parameter>column</parameter>
++<parameter>URL</parameter></userinput></term>
++<listitem><para>Navigates to the specified column after opening the document.
++</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><userinput><command>kate</command>
++<option>--stdin</option></userinput></term>
++<listitem><para>Reads the document content from STDIN. This
++is similar to the common option <option>-</option> used in many command line
++programs, and allows you to pipe command output into &kate;.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><userinput><command>kate</command>
+ <option>--help-all</option></userinput></term>
+ <listitem>
+ <para>
+@@ -125,12 +193,10 @@
+ 
+ <varlistentry>
+ <term><userinput><command>kate</command>
+-<option>--version</option></userinput></term>
++<option>-v</option> <option>--version</option></userinput></term>
+ <listitem>
+ <para>
+-Lists version information for &Qt;, &kde;, and &kate;.  Also available
+-through <userinput><command>kate</command>
+-<option>-V</option></userinput>
++Lists version information for &Qt;, &kde;, and &kate;.
+ </para>
+ </listitem>
+ </varlistentry>
+@@ -164,7 +230,7 @@
+ <link linkend="quick-start">Quick Start</link> will show you how to
+ toggle four simple options that will let you configure some of &kate;'s
+ more powerful features right away. <link linkend="keystroke-commands">
+-Keystroke Commands</link> lays out some of the default keystroke
++Shortcuts</link> lays out some of the default keystroke
+ shortcuts for those who can't or don't want to use a mouse.
+ </para>
+ 
+@@ -179,52 +245,43 @@
+ 
+ <para> When you start &kate; for the first time you'll see two windows
+ with white backgrounds. Above the two windows is a toolbar with the
+-usual labeled icons. And above that, a menu bar.
++usual labeled icons. And above that, a menubar.
+ </para>
+ 
+ <para>
+-The left-hand window is a dockable side bar. It combines the Filelist
+-and Fileselector windows. Switch between the two by clicking on the tabs
+-at the top of the window. </para>
++The left-hand window is a side bar. It combines the Documents
++and Filesystem Browser windows. Switch between the two by clicking on the tabs
++to the left of the window. </para>
+ 
+ <para>
+ If you've started &kate; with a file, the right-hand window will show
+-the file you are editing and the Filelist on the side bar will show the
+-name of the file. Use the Fileselector window to open files.
++the file you are editing and the Documents on the side bar will show the
++name of the file. Use the Filesystem Browser window to open files.
+ </para>
+ 
+ <para>
+-You can toggle the Filelist and Fileselector window on and off in
+-<guimenu>Settings</guimenu> menu. This menu offers you your first
+-glimpse into &kate;'s power and flexibility.  In this section we'll look
+-at four items:
++You can toggle the Documents and Filesystem Browser window on and off in
++<menuchoice><guimenu>Window</guimenu><guimenu>Tool Views</guimenu></menuchoice>
++menu. This menu offers you your first glimpse into &kate;'s power and
++flexibility.  In this section we'll look at tree items:
+ </para>
+ 
+ <variablelist>
+-<varlistentry>
+-<term><menuchoice><guimenuitem>Show
+-Toolbar</guimenuitem></menuchoice></term>
+-<listitem>
+-<para>
+-Toggles the toolbar on and off.
+-</para>
+-</listitem>
+-</varlistentry>
+ 
+ <varlistentry>
+ <term>
+ <menuchoice>
+-<guimenuitem>Show Filelist</guimenuitem>
++<guimenuitem>Show/Hide Documents</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+ <para>
+-Toggles the Filelist on and off. If the Filelist/Fileselector window is
++Toggles the Documents on and off. If the Documents/Filesystem Browser window is
+ not open, &kate; launches the side bar as a separate, undocked,
+ window. To dock the window grab the two thin parallel lines above the
+ tabs by clicking on them with your &LMB; and holding the button
+ down. Drag the the window into &kate;'s editing window and release the
+-&LMB; when you have positioned the Filelist/Fileselector window as you
++&LMB; when you have positioned the Documents/Filesystem Browser window as you
+ prefer.
+ </para>
+ 
+@@ -238,23 +295,23 @@
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+-<term><menuchoice><guimenuitem>Show
+-Fileselector</guimenuitem></menuchoice></term>
++<term><menuchoice><guimenuitem>Show/Hide
++Filesystem Browser</guimenuitem></menuchoice></term>
+ <listitem>
+ <para>
+-Toggles the Fileselector on and off. This menu item is the same as
+-<guimenuitem>Show Filelist</guimenuitem> with one difference.  Toggling
+-it on launches the window with the Fileselector on top.
++Toggles the Filesystem Browser on and off. This menu item is the same as
++<guimenuitem>Show Documents</guimenuitem> with one difference.  Toggling
++it on launches the window with the Filesystem Browser on top.
+ </para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><menuchoice><guimenuitem>Show
+-Console</guimenuitem></menuchoice></term>
++<term><menuchoice><guimenuitem>Show/Hide
++Terminal</guimenuitem></menuchoice></term>
+ <listitem>
+ <para>
+-Toggles a console emulator on and off at the bottom of &kate;'s
++Toggles a terminal emulator on and off at the bottom of &kate;'s
+ window. In other words, it gives you a command line within the
+ application.
+ </para>
+@@ -264,7 +321,7 @@
+ </sect2>
+ 
+ <sect2 id="keystroke-commands">
+-<title>Keystroke Commands</title>
++<title>Shortcuts</title>
+ 
+ <para>
+ Many of &kate;'s keystroke commands (shortcuts) are configurable by
+@@ -281,8 +338,7 @@
+ Toggle between Insert and Overwrite mode. When in insert mode the editor
+ will add any typed characters to the text and push any previously typed
+ data to the right of the text cursor. Overwrite mode causes the entry of
+-each character to eliminate the character immediately to the right of
+-the text cursor.</para></entry>
++each character to eliminate the current character.</para></entry>
+ </row>
+ <row>
+ <entry><para><keycombo><keycap>Left Arrow</keycap></keycombo></para></entry>
+@@ -403,6 +459,54 @@
+ 
+ </sect1>
+ 
++<sect1 id="fundamentals-using-sessions">
++<title>Using Sessions</title>
++
++<para>Sessions is how &kate; lets you keep more than one list of files and
++GUI configuration around. You can have as many named sessions as you want,
++and you can use unnamed or anonymous sessions for files you want to use only
++once. Currently &kate; can save the list of open files, and the general window
++configuration in the session, future versions of &kate; may add more features
++that can be saved in sessions. With the introduction of sessions, &kate; also
++allows you to open any number of instances of the application instead of just
++one as it used to do as the default behavior.</para>
++
++<para>Sessions are supported in tree areas:
++
++<itemizedlist>
++<listitem><para><link linkend="command-line-options"><emphasis>Command line
++options</emphasis></link> that lets you select and start sessions when launching
++kate from the command line.</para>
++</listitem>
++<listitem><para><link linkend="sessions-menu"><emphasis>The Sessions
++menu</emphasis></link> that lets you switch, save, start and manage your
++sessions</para></listitem>
++<listitem><para><link linkend="config-dialog-sessions"><emphasis>Configuration
++options</emphasis></link> that lets you decide how sessions generally should
++behave.</para></listitem>
++</itemizedlist>
++
++</para>
++
++<para>When you get used to using sessions you will hopefully see that they
++provide a very simple and efficient tool for working in different areas.
++However, if you prefer the old &kate; behavior (one instance opens all files),
++you can easily achieve that by following this simple strategy:
++
++<itemizedlist>
++<listitem><para>Make kate allways start with the <option>--use</option>
++parameter by adding that to the command in the application preferences,
++and additionally using a shell alias.</para></listitem>
++<listitem><para>Configure &kate; to load the last used session at startup.</para>
++</listitem>
++<listitem><para>Configure &kate; to save the file list when closing a session.
++</para></listitem>
++<listitem><para>Load the default session once</para></listitem>
++</itemizedlist>
++</para>
++
++</sect1>
++
+ <sect1 id="fundamentals-getting-help">
+ 
+ <title>Getting Help</title>
+@@ -413,7 +517,7 @@
+ <variablelist>
+ 
+ <varlistentry>
+-<term>This manual</term> 
++<term>This manual</term>
+ 
+ <listitem>
+ <para>Offers detailed documentation on all menu commands,
+@@ -429,7 +533,7 @@
+ </varlistentry>
+ 
+ <varlistentry id="whats-this">
+-<term>What's This Help</term> 
++<term>What's This Help</term>
+ <listitem>
+ <para>What's This help offers immediate help with single elements of
+ graphical windows, such as buttons or other window areas.</para>
+--- doc/kate/plugins.docbook	(revision 488815)
++++ doc/kate/plugins.docbook	(revision 494868)
+@@ -1,11 +1,28 @@
+ <chapter id="plugins">
++
+ <chapterinfo>
+ <authorgroup>
+-<author><personname><firstname></firstname></personname></author>
++<author>&Anders.Lund; &Anders.Lund.mail;</author>
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+ </chapterinfo>
+-<title>Working with Plugins</title>
+-<para>This chapter will describe topics related to using plugins</para>
+ 
++<title>Working with Plug-ins</title>
++
++<para>Kate is using two different forms of plug-ins, namely plug-ins for the
++&kate; application and plug-ins for the &kate; editor component. The latter are
++available to any application using the editor component, such as KDevelop,
++Quanta, Kile, Kwrite and many others, while application plug-ins are specific
++to the &kate; application.</para>
++
++<para>You can enable both types of plug-ins in the <link
++linkend="configuring-kate-configdialog">configuration dialog</link>, which also
++provides access to additional configuration options for plug-ins that requires
++that.</para>
++
++<para>There are many plugins for various purposes available in the kdeaddons
++module, and you can search the web for more. A few plugins are shipped with the
++editor component, for doing word completion, automatic bookmarks, insert files,
++thesaurus and word spell checking and incremental search.</para>
++
+ </chapter>
+--- doc/kate/menus.docbook	(revision 488815)
++++ doc/kate/menus.docbook	(revision 494868)
+@@ -25,7 +25,7 @@
+ <listitem>
+ <para>
+ This command <action>starts a new document</action> in the editing
+-window.  In the <guibutton>Filelist</guibutton> on the left the new file
++window.  In the <guibutton>Documents</guibutton> list on the left the new file
+ is named <emphasis>Untitled</emphasis>.
+ </para>
+ </listitem>
+@@ -39,68 +39,13 @@
+ <keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo>
+ </shortcut>
+ <guimenu>File</guimenu>
+-<guimenuitem>Open</guimenuitem>
++<guimenuitem>Open...</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>
+-This command does not <action>open a file</action>. It
+-launches &kde;'s open file dialog box which waits for you
+-to select the files you want to open.
++<para>Launches &kde;'s open file dialog box to let you open one or more files.
+ </para>
+ 
+-<para>
+-<!-- TODO: sorry, isn't this *way* to detailed??? (dnaber) -->
+-The open file dialog box works like a simple version of &konqueror;. Use
+-your &LMB; to click on a file name to select it. Double-click on a file
+-name to open that file. Once you've selected a file name, you can also
+-press the <guibutton>OK</guibutton> button to open the
+-file.
+-</para>
+-<tip>
+-<para>
+-Select multiple files by holding down the &Ctrl; or the
+-&Shift; key along with the &LMB;.
+-<keycombo action="simul">
+-&Ctrl;<mousebutton>Left</mousebutton>
+-</keycombo>
+-click selects one file at a time.
+-<keycombo action="simul">
+-&Shift;<mousebutton>Left</mousebutton>
+-</keycombo>
+-click selects a contiguous set of files.
+-</para>
+-</tip>
+-
+-<para>
+-Clicking on a folder name in the file selection window
+-opens that folder and displays its contents.
+-Clicking on a file name shows a thumbnail view of the file in the
+-preview window to the right of the file system window.
+-</para>
+-
+-<para>
+-Use the buttons and combo box on the toolbar above the file selection
+-window to move through the file system or to adjust the properties of
+-the open file dialog box.
+-</para>
+-
+-<para>
+-Below the file selection window is the Location
+-combo  box. Type the name of the file you want to edit
+-here. If you click the arrow on the right of the drop down
+-box, you can choose from recently used files. Open several
+-files at once by quoting each file name.
+-</para>
+-
+-<para>
+-Below the Location combo box is the Filter combo box.  Enter file masks
+-here to filter the kinds of files shown in the selection window. For
+-example, typing the filter <literal role="extension">*.txt</literal> and
+-pressing <keycap>Enter</keycap> will limit the display to files with a
+-<literal role="extension">.txt</literal> extension.  The Filter combo
+-contains a list of your most recently used filters.
+-</para>
+ </listitem>
+ </varlistentry>
+ 
+@@ -122,6 +67,26 @@
+ 
+ <varlistentry>
+ <term>
++<anchor id="open-with"/>
++<menuchoice>
++<guimenu>File</guimenu>
++<guimenuitem>Open With</guimenuitem>
++</menuchoice>
++</term>
++<listitem>
++<para>
++This submenu presents a list of applications known to handle the mime type
++of your current document. Activating an entry will open the current document
++with that application.</para>
++<para>In addition, a entry <guimenuitem>Other...</guimenuitem> command launches
++the open with dialog box that allows you to <action>select another application
++to open the active file</action>. Your file will still be open in &kate;.
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term>
+ <anchor id="save"/>
+ <menuchoice>
+ <shortcut>
+@@ -146,7 +111,7 @@
+ <anchor id="save-as"/>
+ <menuchoice>
+ <guimenu>File</guimenu>
+-<guimenuitem>Save As</guimenuitem>
++<guimenuitem>Save As...</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+@@ -179,7 +144,7 @@
+ </term>
+ <listitem>
+ <para>
+-This command <action>saves all open files</action>.
++This command <action>saves all modified open files</action>.
+ </para>
+ </listitem>
+ </varlistentry>
+@@ -197,7 +162,7 @@
+ </term>
+ <listitem>
+ <para>
+-<action>Reloads the active file from disk</action>.  This command is
++<action>Reloads the active file</action>.  This command is
+ useful if another program or process has changed the file while you have
+ it open in &kate;
+ </para>
+@@ -206,40 +171,52 @@
+ 
+ <varlistentry>
+ <term>
+-<anchor id="open-with"/>
++<anchor id="print"/>
+ <menuchoice>
++<shortcut>
++<keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo>
++</shortcut>
+ <guimenu>File</guimenu>
+-<guimenuitem>Open with</guimenuitem>
++<guimenuitem>Print...</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+ <para>
+-This command launches the open with dialog box that allows you to
+-<action>select another application to open the active
+-file</action>. Your file will still be open in &kate;.
++<action>Print the active file</action>.
+ </para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term>
+-<anchor id="print"/>
++<term id="export-as-html">
+ <menuchoice>
+-<shortcut>
+-<keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo>
+-</shortcut>
+ <guimenu>File</guimenu>
+-<guimenuitem>Print</guimenuitem>
++<guimenuitem>Export as HTML...</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+ <para>
+-<action>Print the active file</action>.
++Export your file in HTML format so your document can be viewed as a
++web page.
+ </para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
++<term id="mail">
++<menuchoice>
++<guimenu>File</guimenu>
++<guimenuitem>Mail...</guimenuitem>
++</menuchoice>
++</term>
++<listitem>
++<para>
++Open your mail client and attach the file in the mail.
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
+ <term>
+ <anchor id="close"/>
+ <menuchoice>
+@@ -277,22 +254,6 @@
+ 
+ <varlistentry>
+ <term>
+-<anchor id="new-window"/>
+-<menuchoice>
+-<guimenu>File</guimenu>
+-<guimenuitem>New Window</guimenuitem>
+-</menuchoice>
+-</term>
+-<listitem>
+-<para>
+-<action>Opens another instance of &kate;</action>.
+-The new instance will be identical to your previous instance.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term>
+ <anchor id="quit"/>
+ <menuchoice>
+ <shortcut>
+@@ -379,6 +340,19 @@
+ 
+ <varlistentry>
+ <term>
++<anchor id="edit-copy-as-html"/>
++<menuchoice>
++<guimenu>Edit</guimenu>
++<guimenuitem>Copy as HTML</guimenuitem>
++</menuchoice>
++</term>
++<listitem>
++<para>Copies selected text with the syntax highlight as HTML text.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term>
+ <anchor id="edit-paste" />
+ <menuchoice>
+ <shortcut><keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo></shortcut>
+@@ -424,9 +398,10 @@
+ <term>
+ <anchor id="edit-toggle-block-selection"/>
+ <menuchoice>
+-<shortcut><keycombo action="simul"><keycap>F4</keycap></keycombo></shortcut>
++<shortcut><keycombo action="simul">&Ctrl;<keycap>Shift</keycap>
++<keycap>B</keycap></keycombo></shortcut>
+ <guimenu>Edit</guimenu>
+-<guimenuitem>Toggle Block Selection</guimenuitem>
++<guimenuitem>Block Selection Mode</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+@@ -442,7 +417,7 @@
+ <menuchoice>
+ <shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut>
+ <guimenu>Edit</guimenu>
+-<guimenuitem>Find</guimenuitem>
++<guimenuitem>Find...</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+@@ -484,7 +459,7 @@
+ <menuchoice>
+ <shortcut><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo></shortcut>
+ <guimenu>Edit</guimenu>
+-<guimenuitem>Replace</guimenuitem>
++<guimenuitem>Replace...</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+@@ -492,73 +467,8 @@
+ </listitem>
+ </varlistentry>
+ 
+-
+ <varlistentry>
+ <term>
+-<anchor id="edit-indent"/>
+-<menuchoice>
+-<shortcut><keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo></shortcut>
+-<guimenu>Edit</guimenu>
+-<guimenuitem>Indent</guimenuitem>
+-</menuchoice>
+-</term>
+-<listitem><!-- FIXME LINK -->
+-<para>Adds one indent step to the current line, or all lines covered by a possible selection.</para>
+-<para>The indentation depends on the settings in the Indent Page of the Configuration Dialog.</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term>
+-<anchor id="edit-unindent"/>
+-<menuchoice>
+-<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>I</keycap></keycombo></shortcut>
+-<guimenu>Edit</guimenu>
+-<guimenuitem>Unindent</guimenuitem>
+-</menuchoice>
+-</term>
+-<listitem>
+-<para>Removes one indent step from the current line, or all lines covered by a possible selection.</para>
+-<para>The indentation depends on the settings in the Indent Page of the Configuration Dialog.</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term>
+-<anchor id="edit-comment"/>
+-<menuchoice>
+-<shortcut><keycombo action="simul">&Ctrl;<keycap>#</keycap></keycombo></shortcut>
+-<guimenu>Edit</guimenu>
+-<guimenuitem>Comment</guimenuitem>
+-</menuchoice>
+-</term>
+-<listitem>
+-<para>Enclose or prepend the current line, or any selected text, with (a) comment marker(s), according to the rules defined by the
+-syntax rules for the document. Does nothing if no comment rules are defined.</para>
+-<para>This is interesting mostly when working with source code, for example with C/C++, perl, python &etc;,
+-as well as with markup text like <acronym>HTML</acronym>, &XML;, <acronym>CSS</acronym> and so on.</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term>
+-<anchor id="edit-uncomment"/>
+-<menuchoice>
+-<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>#</keycap></keycombo></shortcut>
+-<guimenu>Edit</guimenu>
+-<guimenuitem></guimenuitem>
+-</menuchoice>
+-</term>
+-<listitem>
+-<para>Remove comment marker(s) from the current line, or a possible selection, according to the
+-syntax rules for the document.
+-</para>
+-<para>See also <link linkend="edit-comment"><guimenu>Edit</guimenu><guimenuitem>Comment</guimenuitem></link></para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term>
+ <anchor id="edit-go-to-line"/>
+ <menuchoice>
+ <shortcut><keycombo action="simul">&Ctrl;<keycap>G</keycap></keycombo></shortcut>
+@@ -578,15 +488,11 @@
+ 
+ <sect1 id="document-menu">
+ <title>The <guimenu>Document</guimenu> Menu</title>
+-<para>The <guimenu>Document</guimenu> menu has two purposes:</para>
+-<itemizedlist>
+-<listitem><para>Allowing you to change the document-specific settings for the
+-currently active document.</para></listitem>
+-<listitem><para>Choosing which of the open documents to work on</para></listitem>
+-</itemizedlist>
+-<para>A menu entry for each open document will be available below the entries documented here.
+-Clicking one of these will bring the requested document to focus. If you have multiple
+-frames, an editor for that document will be displayed in the currently active frame.</para>
++<para>The Document menu provides a menu entry for each open document.
++Clicking one of these will bring the requested document to focus. If you have
++multiple frames, an editor for that document will be displayed in the currently
++active frame.</para>
++<para>In addition, commands to browse your open documents are provided:
+ <variablelist>
+ <title>Menu items</title>
+ 
+@@ -618,7 +524,7 @@
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>This will bring the previous document in the stack in focus. If you have
++<para>This will bring the next document in the stack in focus. If you have
+ multiple frames, an editor for the document will be displayed in the currently
+ active frame.</para>
+ <para>The order is the order in which the documents were opened,
+@@ -626,63 +532,8 @@
+ &kate;.</para>
+ </listitem>
+ </varlistentry>
+-
+-<varlistentry>
+-<term>
+-<anchor id="document-highlight-mode"/>
+-<menuchoice>
+-<guimenu>Document</guimenu>
+-<guisubmenu>Highlight Mode</guisubmenu>
+-</menuchoice>
+-</term>
+-<listitem>
+-<para>The <guimenu>Highlight Mode</guimenu> menu allows you to manually
+-decide which syntax rules to use for highlighting and
+-<link linkend="edit-comment"><guimenuitem>comment</guimenuitem></link>'ing
+-the active document. The menu groups the available syntax rule sets into logical groups.</para>
+-<!-- FIXME link to syntax rules chapter, when written :) -->
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term>
+-<anchor id="document-end-of-line"/>
+-<menuchoice>
+-<guimenu>Document</guimenu>
+-<guisubmenu>End of Line</guisubmenu>
+-</menuchoice>
+-</term>
+-<listitem>
+-<para>This menu allows you to manually set the End of Line mode for
+-the active document. Changing the mode will replace all line
+-separators in the document with the character sequence for the new
+-mode.</para>
+-
+-<para>The available modes are:</para>
+-
+-<variablelist>
+-<varlistentry>
+-<term><guimenuitem>Unix</guimenuitem></term>
+-<listitem>
+-<para>On &UNIX; systems, end of line is a single newline
+-character.</para></listitem>
+-</varlistentry>
+-<varlistentry>
+-<term><guimenuitem>DOS</guimenuitem></term>
+-<listitem><para>On <acronym>DOS</acronym> (and &Windows;) systems, end
+-of line is represented by a carriage return followed by a
+-newline.</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guimenuitem>Mac</guimenuitem></term>
+-<listitem><para>On &Mac; systems, end of line is represented by a by a
+-carriage return.</para></listitem>
+-</varlistentry>
+ </variablelist>
+-</listitem>
+-</varlistentry>
+-</variablelist>
++</para>
+ </sect1>
+ 
+ <sect1 id="view-menu">
+@@ -695,55 +546,41 @@
+ <title>Menu Items</title>
+ 
+ <varlistentry>
+-<term>
+-<anchor id="view-split-vertical"/>
+-<menuchoice>
+-<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>L</keycap></keycombo></shortcut>
+-<guimenu>View</guimenu>
+-<guimenuitem>Split Vertical</guimenuitem>
+-</menuchoice>
+-</term>
+-<listitem>
+-<para>This will split the frame (which may be the main editing area) in two equally sized frames,
+-the new one to the left of the current one. The new frame gets the focus, and will display the
+-same document as the old one.</para>
+-<para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link></para>
++<term><menuchoice><shortcut><keycap>F7</keycap></shortcut>
++<guimenu>View</guimenu><guimenuitem>Switch to Command Line</guimenuitem>
++</menuchoice></term>
++<listitem><para>This command will toggle the display of the
++<link linkend="advanced-editing-tools-commandline">built in command line</link>.
++</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice><guimenu>View</guimenu><guisubmenu>Schema</guisubmenu>
++</menuchoice></term>
++<listitem><para>This menu lists the available schemas. You can change the schema
++for the current view here, to change the default schema you need to
++use the <link linkend="config-dialog-editor-colors">config dialog</link></para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term>
+-<anchor id="view-split-horizontal"/>
+-<menuchoice>
+-<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>T</keycap></keycombo></shortcut>
+-<guimenu>View</guimenu>
+-<guimenuitem>Split Horizontal</guimenuitem>
+-</menuchoice>
++<term><menuchoice><shortcut><keycombo action="simul"><keycap>F10</keycap>
++</keycombo></shortcut>
++<guimenu>View</guimenu><guimenuitem>Dynamic Word Wrap</guimenuitem></menuchoice>
+ </term>
+-<listitem>
+-<para>Splits the current frame (which may be the main editing area) in two equally sized frames,
+-the new one at the bottom half. The new frame gets the focus, and displays the same document as
+-the old one.</para>
+-<para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link></para>
++<listitem><para>Toggles dynamic word wrap in the current view. Dynamic word
++wrap makes all the text in a view visible without the need for horizontal
++scrolling by rendering one actual line on more visual lines as needed.</para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term>
+-<anchor id="view-close-current"/>
+-<menuchoice>
+-<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>R</keycap></keycombo></shortcut>
+-<guimenu>View</guimenu>
+-<guimenuitem>Close Current</guimenuitem>
+-</menuchoice>
+-</term>
+-<listitem>
+-<para>Closes the active frame. This is disabled, if there is only one frame
+-(the main editing area).</para> <para>No documents get closed by closing a
+-frame &ndash; they will still be available in the <link
+-linkend="document-menu"><guimenu>Documents</guimenu> Menu</link> as well as in
+-the File List.</para> <para>See also <link linkend="kate-mdi">Working with the
+-&kate; MDI</link></para>
++<term><menuchoice><guimenu>View</guimenu><guimenuitem>Show/Hide Static Word
++Wrap Marker</guimenuitem></menuchoice></term>
++<listitem><para>Toggles the display of a vertical line indicating the position
++of the wrap width as configured in the <link
++linkend="config-dialog-editor-wrap-words-at">config dialog</link>. This
++feature requires that you use a true fixed-width font.</para>
+ </listitem>
+ </varlistentry>
+ 
+@@ -753,13 +590,12 @@
+ <menuchoice>
+ <shortcut><keycombo action="simul"><keycap>F6</keycap></keycombo></shortcut>
+ <guimenu>View</guimenu>
+-<guimenuitem>Show Icon Border</guimenuitem>
++<guimenuitem>Show/Hide Icon Border</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>This is a toggle item. Setting it on checked will make the
+-<!--<link linkend="katepart-iconborder">Icon Border</link> visible in the left//-->
+-side of the active editor, and vice versa.</para>
++<para>This is a toggle item. Setting it on checked will make the Icon Border
++visible in the left side of the active editor, and vice versa.</para>
+ </listitem>
+ </varlistentry>
+ 
+@@ -769,7 +605,7 @@
+ <menuchoice>
+ <shortcut><keycombo action="simul"><keycap>F11</keycap></keycombo></shortcut>
+ <guimenu>View</guimenu>
+-<guimenuitem>Show Line Numbers</guimenuitem>
++<guimenuitem>Show/Hide Line Numbers</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+@@ -780,55 +616,67 @@
+ </varlistentry>
+ 
+ <varlistentry>
++<term><menuchoice><guimenu>View</guimenu><guimenuitem>Show/Hide Scrollbar
++Marks</guimenuitem></menuchoice></term>
++<listitem><para>Toggles the visualization of bookmarks (and other marks) on the
++vertical scrollbar. When enabled, marks are represented by a thin line in the
++mark color at the scrollbar, middleclicking on the lines will scroll the view
++to a position near the mark.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice><shortcut><keycombo action="simul"><keycap>F9</keycap>
++</keycombo></shortcut>
++<guimenu>View</guimenu><guimenuitem>Show/Hide Folding Markers</guimenuitem>
++</menuchoice></term>
++<listitem><para>Toggles the display of the folding marker pane in the left
++side of the view. See <link linkend="advanced-editing-tools-code-folding">Using
++Code Folding</link>.</para></listitem>
++</varlistentry>
++
++<varlistentry>
+ <term>
+-<anchor id="view-go"/>
++<anchor id="view-code-folding"/>
+ <menuchoice>
+-<guimenu>View</guimenu>
+-<guisubmenu>Go</guisubmenu>
++<guimenuitem>Code Folding</guimenuitem>
+ </menuchoice>
+ </term>
++
+ <listitem>
+-
+ <variablelist>
+-
+ <varlistentry>
+-<term>
+-<anchor id="view-go-next-view"/>
+-<menuchoice>
+-<shortcut><keycombo action="simul"><keycap>F8</keycap></keycombo></shortcut>
+-<guimenuitem>Next View</guimenuitem>
+-</menuchoice>
++<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;
++<keycap>Shift</keycap><keycap>-</keycap></keycombo></shortcut>
++<guimenuitem>Collapse Toplevel</guimenuitem></menuchoice>
+ </term>
+-<listitem>
+-<para>Move focus to the next frame; the order is following order of creation rather than
+-that of visual logic. This behavior may change in a future version of &kate;</para>
+-<para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link></para>
+-</listitem>
++<listitem><para>Collapse all toplevel regions in the document.</para></listitem>
+ </varlistentry>
+-
+ <varlistentry>
+-<term>
+-<anchor id="view-go-previous-view"/>
+-<menuchoice>
+-<shortcut><keycombo action="simul">&Shift;<keycap>F8</keycap></keycombo></shortcut>
+-<guimenuitem>Previous View</guimenuitem>
+-</menuchoice>
++<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;
++<keycap>Shift</keycap><keycap>+</keycap></keycombo></shortcut>
++<guimenuitem>Expand Toplevel</guimenuitem></menuchoice>
+ </term>
+-<listitem>
+-<para>Move focus to the previous frame; the order is following order of creation rather than
+-that of visual logic. This behavior may change in a future version of &kate;</para>
+-<para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link></para>
+-</listitem>
++<listitem><para>Expand all toplevel regions in the document.</para></listitem>
+ </varlistentry>
+-
++<varlistentry>
++<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;
++<keycap>-</keycap></keycombo></shortcut>
++<guimenuitem>Collapse One Local Level</guimenuitem></menuchoice>
++</term>
++<listitem><para>Collapse the region closest to the cursor.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;
++<keycap>+</keycap></keycombo></shortcut>
++<guimenuitem>Expand One Local Level</guimenuitem></menuchoice>
++</term>
++<listitem><para>Expand the region closest to the cursor.</para></listitem>
++</varlistentry>
+ </variablelist>
+-
+ </listitem>
+ 
+ </varlistentry>
+ 
+-
+-
+ </variablelist>
+ 
+ </sect1>
+@@ -855,11 +703,12 @@
+ <menuchoice>
+ <shortcut><keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo></shortcut>
+ <guimenu>Bookmarks</guimenu>
+-<guimenuitem>Toggle Bookmark</guimenuitem>
++<guimenuitem>Set/Clear Bookmark</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>Sets or removes a bookmark in the current line of the active document. (If it's there, it is removed, otherwise one is set.)</para>
++<para>Sets or removes a bookmark in the current line of the active document.
++(If it's there, it is removed, otherwise one is set.)</para>
+ </listitem>
+ </varlistentry>
+ 
+@@ -868,15 +717,35 @@
+ <anchor id="bookmarks-clear-bookmarks"/>
+ <menuchoice>
+ <guimenu>Bookmarks</guimenu>
+-<guimenuitem>Clear Bookmarks</guimenuitem>
++<guimenuitem>Clear All Bookmarks</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>Clears (removes) all bookmarks of the active document.</para>
++<para>Clears (removes) all bookmarks in the active document.</para>
+ </listitem>
+ </varlistentry>
+ 
++<varlistentry id="bookmarks-previous">
++<term><menuchoice><shortcut><keycombo action="simul">&Alt;
++<keycap>Page Up</keycap></keycombo></shortcut>
++<guimenu>Bookmarks</guimenu><guimenuitem>Previous</guimenuitem></menuchoice>
++</term>
++<listitem><para>This will move the cursor to beginning of the first above line
++with a bookmark. The menuitem text will include the line number and the first
++piece of text on the line. This item is only available when there is a bookmark
++in a line above the cursor.</para></listitem>
++</varlistentry>
+ 
++<varlistentry id="bookmarks-next">
++<term><menuchoice><shortcut><keycombo action="simul">&Alt;
++<keycap>Page Down</keycap></keycombo></shortcut>
++<guimenu>Bookmarks</guimenu><guimenuitem>Next</guimenuitem></menuchoice></term>
++<listitem><para>This will move the cursor to beginning of the next line with a
++bookmark. The menuitem text will include the line number and the first piece of
++text on the line. This item is only available when there is a bookmark in a line
++below the cursor.</para></listitem>
++</varlistentry>
++
+ </variablelist>
+ 
+ </sect1>
+@@ -885,194 +754,670 @@
+ 
+ <title>The <guimenu>Tools</guimenu> Menu</title>
+ 
+-<para>The <guimenu>Tools</guimenu> menu contains commands of two categories:
+-<itemizedlist>
+-<listitem><para>Tools doing advanced editing of the current document,
+-for example <link
+-linkend="tools-menu-editing-command"><guimenuitem>Editing
+-Command</guimenuitem></link>.</para>
++<variablelist>
++
++<varlistentry>
++<term><menuchoice><guimenu>Tools</guimenu><guimenuitem>Pipe to
++Console</guimenuitem></menuchoice></term>
++<listitem><para>Feed the currently selected text ito the built in terminal
++emulator. No newline is added after the text.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice><guimenu>Tools</guimenu><guisubmenu>External
++Tools</guisubmenu></menuchoice></term>
++<listitem><para>This submenu contains all the <link
++linkend="kate-mdi-tools-externaltools">external tools</link>you have
++configured.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-read-only"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Read Only Mode</guimenuitem></menuchoice></term>
++<listitem>
++<para>Set the current document to Read Only mode. This prevents any text
++addition and any changes in the document formatting.</para>
+ </listitem>
+-<listitem><para>Tools adding functionality to the application, for example the
+-<link linkend="tools-menu-find-in-files"><guimenuitem>Find in
+-Files</guimenuitem></link> tool.</para>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-filetype"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Filletype</guimenuitem></menuchoice></term>
++<listitem>
++<para>Choose the filetype scheme you prefer for the active document. This
++overwrites the global <link linkend="config-dialog-editor-filetypes">filetype</link>
++mode set in <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure
++Editor...</guimenuitem></menuchoice> in the Filetypes tab for your current
++document only.</para>
+ </listitem>
+-</itemizedlist>
+-</para>
++</varlistentry>
+ 
++<varlistentry>
++<term><anchor id="tools-highlighting"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Highlighting</guimenuitem></menuchoice></term>
++ <listitem>
++<para>Choose the Highlighting scheme you prefer for the active document. This
++overwrites the global highlighting mode set in <menuchoice>
++<guimenu>Settings</guimenu> <guimenuitem>Configure Editor...</guimenuitem>
++</menuchoice> for your current document only.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-indentation"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Indentation</guimenuitem></menuchoice></term>
++<listitem>
++<para>Choose the <link linkend="kate-part-autoindent">style of
++indentation</link> you want for your active document.
++This overwrites the global indentation mode set in <menuchoice>
++<guimenu>Settings</guimenu> <guimenuitem>Configure Editor...</guimenuitem>
++</menuchoice> for your current document only.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-encoding"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Encoding</guimenuitem></menuchoice></term>
++<listitem>
++<para>You can overwrite the default encoding set in <menuchoice>
++<guimenu>Settings</guimenu>
++<guimenuitem>Configure
++Editor...</guimenuitem></menuchoice> in the <guilabel>Open/Save</guilabel> tab
++to set a different encoding for your current document. The encoding you
++set here will be only valid for your current document.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-end-of-line"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>End of Line</guimenuitem></menuchoice></term>
++<listitem>
++<para>Choose your prefered end of line mode for your active
++document. This overwrites the global end of line mode set in <menuchoice>
++<guimenu>Settings</guimenu> <guimenuitem>Configure Editor...</guimenuitem>
++</menuchoice> for your current document only.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-spelling"/><menuchoice>
++<guimenu>Tools</guimenu><guimenuitem>Spelling...</guimenuitem></menuchoice>
++</term>
++
++<listitem><para><action>This initiates the spellchecking program - a program
++designed to help the user catch and correct any spelling errors.</action>
++Clicking on this entry will start the checker and bring up the speller dialog
++box through which the user can control the process.  There are four settings
++lined up vertically in the center of the dialog with their corresponding labels
++just to the left.  Starting at the top they are:</para>
++
+ <variablelist>
++<varlistentry>
++<term><guilabel>Unknown word:</guilabel></term>
++<listitem><para>Here, the spellchecker indicates the word currently under
++consideration.  This happens when the checker encounters a word not in its
++dictionary - a file containing a list of correctly spelled words against which
++it compares each word in the editor.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Replace with:</guilabel></term>
++<listitem><para> If the checker has any similar words in its dictionary the
++first one will be listed here.  The user can accept the suggestion, type in his
++or her own correction, or choose a different suggestion from the next
++box.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Suggested Words:</guilabel></term>
++<listitem><para> The checker may list here a number of possible replacements for
++the word under consideration.  Clicking on any one of the suggestions will cause
++that word to be entered in the <guilabel>Replacement:</guilabel> box,
++above.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Language:</guilabel></term>
++<listitem><para> If you have installed multiple dictionaries, here you can
++select which dictionary/language should be used.</para></listitem>
++</varlistentry>
++</variablelist>
+ 
++<para>On the right side of the dialog box are 5 buttons that allow the user to
++control the spellcheck process.  They are:</para>
++
++<variablelist>
+ <varlistentry>
++<term><guibutton>Add to Dictionary</guibutton></term>
++<listitem><para>Pressing this button adds the word in the <guilabel>Misspelled
++Word:</guilabel> box to the checker's dictionary. This means that in the future
++the checker will always consider this word to be correctly
++spelled.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guibutton>Replace</guibutton></term>
++<listitem><para> This button has the checker replace the word under
++consideration in the document with the word in the
++<guilabel>Replacement:</guilabel> box.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guibutton>Replace All</guibutton></term>
++<listitem><para> This button causes the checker to replace not only the current
++<guilabel>Unknown word:</guilabel> but to automatically make the same
++substitution for any other occurrences of this <guilabel>Misspelled
++Word:</guilabel> in the document.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guibutton>Ignore</guibutton></term>
++<listitem><para>Activating this button will have the checker move on without
++making any changes.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guibutton>Ignore All</guibutton></term>
++<listitem><para> This button tells the checker to do nothing with the current
++<guilabel>Unknown word:</guilabel> and to pass over any other instances of
++the same word.</para> <note><para>This only applies to the current spellcheck
++run.  If the checker is run again later it will stop on this same
++word.</para></note></listitem>
++</varlistentry>
++</variablelist>
++
++<para>Three more buttons are located horizontally along the bottom of the
++spellcheck dialog.  They are:</para>
++
++<variablelist>
++<varlistentry>
++<term><guibutton>Help</guibutton></term>
++<listitem><para> This invokes the &kde; help system starting at the &kate; help
++pages (this document).</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guibutton>Finished</guibutton></term>
++<listitem><para> This button ends the spellcheck process, and returns to the
++document.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guibutton>Cancel</guibutton></term>
++<listitem><para> This button cancels the spellcheck process, all modifications
++are reverted, and you will return to your document.</para></listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
++</variablelist>
++
++<variablelist>
++<varlistentry>
++<term><anchor id="tools-spelling-from-cursor"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Spelling (from cursor)...</guimenuitem></menuchoice></term>
++ <listitem>
++<para>This initiates the spellchecking program but it starts where your cursor
++is instead of at the beginning of the document.</para>
++ </listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-spellcheck-selection"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Spellcheck Selection...</guimenuitem></menuchoice></term>
++ <listitem>
++<para>Spellchecks the current selection.</para>
++ </listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="indent"/><menuchoice>
++<shortcut>
++<keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo>
++</shortcut>
++<guimenu>Tools</guimenu><guimenuitem>Indent</guimenuitem></menuchoice></term>
++<listitem>
++<para>This increases the paragraph's indentation by one step. The size of the
++step depends on the <link linkend="config-dialog-editor-indent">indentation
++settings</link>.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-unindent"/><menuchoice>
++<shortcut>
++<keycombo action="simul">&Ctrl;&Shift;<keycap>I</keycap></keycombo>
++</shortcut>
++<guimenu>Tools</guimenu><guimenuitem>Unindent</guimenuitem></menuchoice></term>
++
++<listitem>
++<para>This reduces the paragraph's indentation by one step. The size of the step
++
++depends on the <link linkend="config-dialog-editor-indent">indentation settings</link>.</para>
++
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-cleanindent"/><menuchoice>
++<guimenu>Tools</guimenu><guimenuitem>Clean
++Indentation</guimenuitem></menuchoice></term>  <listitem>
++<para>This cleans the indentation for the current selection or for the
++line the cursor is currently in. Cleaning the indentation ensures that
++all your selected text follows the indentation mode you choose.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-align"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Align</guimenuitem>
++</menuchoice></term>
++<listitem>
++<para>Causes a realign of the current line or selected lines using the
++indentation mode and indentation settings in the doucment.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-comment"/><menuchoice>
++<shortcut>
++<keycombo action="simul">&Ctrl;<keycap>D</keycap></keycombo>
++</shortcut>
++<guimenu>Tools</guimenu>
++<guimenuitem>Comment</guimenuitem>
++</menuchoice></term>
++<listitem><para>This adds one space to the beginning of the line
++where the text cursor is located or to the beginning of any
++selected lines.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-uncomment"/><menuchoice>
++<shortcut>
++<keycombo action="simul">&Ctrl;&Shift;<keycap>D</keycap></keycombo>
++</shortcut>
++<guimenu>Tools</guimenu>
++<guimenuitem>Uncomment</guimenuitem>
++</menuchoice></term>
++<listitem><para>This removes one space (if any exist) from the beginning of the
++line where the text cursor is located or from the beginning of any
++selected lines.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-uppercase"/><menuchoice>
++<shortcut>
++<keycombo action="simul">&Ctrl;<keycap>U</keycap></keycombo>
++</shortcut>
++<guimenu>Tools</guimenu>
++<guimenuitem>Uppercase</guimenuitem>
++</menuchoice></term>
++<listitem><para>Put the selected text or the letter after the cursor in
++uppercase.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-lowercase"/><menuchoice>
++<shortcut>
++<keycombo action="simul">&Ctrl;&Shift;<keycap>U</keycap></keycombo>
++</shortcut>
++<guimenu>Tools</guimenu>
++<guimenuitem>Lowercase</guimenuitem>
++</menuchoice></term>
++<listitem><para>Put the selected text or the letter after the cursor in
++lowercase.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-capitalize"/><menuchoice>
++<shortcut>
++<keycombo action="simul">&Alt;&Ctrl;<keycap>U</keycap></keycombo>
++</shortcut>
++<guimenu>Tools</guimenu>
++<guimenuitem>Capitalize</guimenuitem>
++</menuchoice></term>
++<listitem><para>Capitalize the selected text or the current
++word.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-join-lines"/><menuchoice>
++<shortcut>
++<keycombo action="simul">&Ctrl;<keycap>J</keycap></keycombo>
++</shortcut>
++<guimenu>Tools</guimenu>
++<guimenuitem>Join Lines</guimenuitem>
++</menuchoice></term>
++<listitem><para>Joins the selected lines, or the current line and the line below
++with one white space character as a separator. Leading/trailing white space on
++joined lines is removed in the affected ends.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-word-wrap-document"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Word Wrap Document</guimenuitem>
++</menuchoice></term>
++<listitem><para>Apply static word wrapping on all the document. That means that
++a new line of text will automatically start when the current
++line exceeds the length specified by the Wrap words at: option
++in the Editing tab in <menuchoice>
++<guimenu>Settings</guimenu><guimenuitem>Configure
++Editor...</guimenuitem></menuchoice></para></listitem>
++</varlistentry>
++
++</variablelist>
++
++
++</sect1>
++
++<sect1 id="sessions-menu">
++<title>The <guimenu>Sessions</guimenu> Menu</title>
++
++<para>This menu contains entries for using and managing &kate; sessions.
++For more information, read <link
++linkend="fundamentals-using-sessions">Using Sessions</link>.</para>
++
++<variablelist>
++
++<varlistentry id="sessions-new">
++<term><menuchoice><guimenu>Sessions</guimenu>
++<guimenuitem>New</guimenuitem></menuchoice></term>
++<listitem><para>Creates a new empty session. All currently open files will
++be closed.</para></listitem>
++
++</varlistentry>
++
++<varlistentry id="sessions-open">
++<term><menuchoice><guimenu>Sessions</guimenu><guimenuitem>Open...</guimenuitem>
++</menuchoice></term>
++<listitem><para>Open an existing session. The Session Chooser dialog is
++displayed to let you choose one.</para></listitem>
++</varlistentry>
++
++<varlistentry id="sessions-quick-open">
++<term><menuchoice><guimenu>Sessions</guimenu><guisubmenu>Quick Open</guisubmenu>
++</menuchoice></term>
++<listitem><para>This submenu lets you open an existing session.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry id="sessions-save">
++<term><menuchoice><guimenu>Sessions</guimenu><guimenuitem>Save</guimenuitem>
++</menuchoice></term>
++<listitem><para>Save the current session. If the session is anonymous, you will
++be prompted for a session name.</para></listitem>
++</varlistentry>
++
++<varlistentry id="sessions-save-as">
++<term><menuchoice><guimenu>Sessions</guimenu><guimenuitem>Save
++As...</guimenuitem></menuchoice></term>
++<listitem><para>Save the current session under a new name. You are prompted for
++a name to use.</para></listitem>
++</varlistentry>
++
++<varlistentry id="sessions-manage">
++<term><menuchoice><guimenu>Sessions</guimenu><guimenuitem>Manage...</guimenuitem>
++</menuchoice></term>
++<listitem><para>Displays the Session Manager dialog which allows you to rename
++and delete sessions.</para></listitem>
++</varlistentry>
++
++
++</variablelist>
++
++</sect1>
++
++<sect1 id="settings-menu">
++
++<title>The <guimenu>Settings</guimenu> Menu</title>
++
++<para>The <guimenu>Settings</guimenu> menu allows you to change the properties
++of the main window, such as showing/hiding toolbars, and provides
++access to the configuration dialogs.</para>
++
++<variablelist>
++
++<varlistentry>
+ <term>
+-<anchor id="tools-menu-editing-command"/>
++<anchor id="settings-toolbars"/>
+ <menuchoice>
+-<shortcut><keycombo action="simul">&Ctrl;<keycap>M</keycap></keycombo></shortcut>
+-<guimenu>Edit</guimenu>
+-<guimenuitem>Editing Command...</guimenuitem>
++<guimenu>Settings</guimenu>
++<guisubmenu>Toolbars</guisubmenu>
+ </menuchoice>
+ </term>
+-<listitem><!-- FIXME LINK, DOCUMENT THAT TODO: add a minimal desc here-->
+-<para>Launch the Editing Command Dialog</para>
++<listitem>
++<para>This submenu lists the available toolbars, each item toggles the display
++of the associated toolbar.</para>
+ </listitem>
+ </varlistentry>
+ 
++<varlistentry id="settings-fullscreen">
++<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Full Screen
++Mode</guimenuitem></menuchoice></term>
++<listitem><para>Toggles full screen display.</para>
++<note><para>This commmand will be moved to the Window menu in a future
++version of &kate;</para></note>
++</listitem>
++</varlistentry>
++
+ <varlistentry>
+ <term>
+-<anchor id="tools-menu-find-in-files"/>
++<anchor id="settings-configure-shortcuts"/>
+ <menuchoice>
+-<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>F</keycap></keycombo></shortcut>
+-<guimenu>Edit</guimenu>
+-<guimenuitem>Find in Files...</guimenuitem>
++<guimenu>Settings</guimenu>
++<guimenuitem>Configure Shortcuts...</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>Launch the Find In Files Dialog to search for a specified text in files on disk.</para>
++<para>Display the the familiar &kde; Keyboard Shortcut Configuration Dialog.</para>
+ </listitem>
+ </varlistentry>
+ 
++
+ <varlistentry>
+ <term>
+-<anchor id="tools-menu-apply-word-wrap"/>
++<anchor id="settings-configure-toolbars"/>
+ <menuchoice>
+-<guimenu>Edit</guimenu>
+-<guimenuitem>Apply Word Wrap</guimenuitem>
++<guimenu>Settings</guimenu>
++<guimenuitem>Configure Toolbars...</guimenuitem>
+ </menuchoice>
+ </term>
+-<listitem><!-- FIXME LINKS TEST MORE? //-->
+-<para>Apply word wrap to ? according to the settings in the ? </para>
++<listitem>
++<para>Display the the familiar &kde; Toolbar Configuration Dialog.</para>
+ </listitem>
+ </varlistentry>
+ 
+-
+ <varlistentry>
+ <term>
+-<anchor id="tools-menu-spelling"/>
++<anchor id="settings-configure-kate"/>
+ <menuchoice>
+-<!-- <shortcut><keycombo action="simul"><keycap></keycap><keycap></keycap></keycombo></shortcut> -->
+-<guimenu>Edit</guimenu>
+-<guimenuitem>Spelling...</guimenuitem>
++<guimenu>Settings</guimenu>
++<guimenuitem>Configure &kate;...</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>Spell check the current document using the &kde; spell checker</para>
++<para>Launch the <link linkend="config-dialog">Main Configuration Dialog</link></para>
+ </listitem>
+ </varlistentry>
+ 
+-
+ </variablelist>
+ 
+-
+ </sect1>
+ 
+-<sect1 id="settings-menu">
++<sect1 id="window-menu">
++<title>the <guimenu>Window</guimenu> Menu</title>
+ 
+-<title>The <guimenu>Settings</guimenu> Menu</title>
+-
+-<para>The <guimenu>Settings</guimenu> menu allows you to change the properties
+-of the main window, such as showing/hiding toolbars and boxes, and provides
+-access to the configuration dialogs.</para>
+-
+ <variablelist>
++<varlistentry>
++<term>
++<anchor id="window-new"/>
++<menuchoice>
++<guimenu>Window</guimenu>
++<guimenuitem>New Window</guimenuitem>
++</menuchoice>
++</term>
++<listitem>
++<para>
++<action>Opens another instance of &kate;</action>.
++The new instance will be identical to your previous instance.
++</para>
++</listitem>
++</varlistentry>
+ 
+ <varlistentry>
+ <term>
+-<anchor id="settings-show-toolbar"/>
++<anchor id="window-split-vertical"/>
+ <menuchoice>
+-<guimenu>Settings</guimenu>
+-<guimenuitem>Show Toolbar</guimenuitem>
++<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>L</keycap></keycombo></shortcut>
++<guimenu>Window</guimenu>
++<guimenuitem>Split Vertical</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>Toggles the display of the main toolbar.</para>
++<para>This will split the frame (which may be the main editing area) in two equally sized frames,
++the new one to the left of the current one. The new frame gets the focus, and will display the
++same document as the old one.</para>
++<para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link></para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+ <term>
+-<anchor id="settings-show-filelist"/>
++<anchor id="window-split-horizontal"/>
+ <menuchoice>
+-<guimenu>Settings</guimenu>
+-<guimenuitem>Show Filelist</guimenuitem>
++<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>T</keycap></keycombo></shortcut>
++<guimenu>Window</guimenu>
++<guimenuitem>Split Horizontal</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>Toggle the display of the &kate; Filelist</para>
++<para>Splits the current frame (which may be the main editing area) in two equally sized frames,
++the new one at the bottom half. The new frame gets the focus, and displays the same document as
++the old one.</para>
++<para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link></para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+ <term>
+-<anchor id="settings-show-fileselector"/>
++<anchor id="window-close-current"/>
+ <menuchoice>
+-<guimenu>Settings</guimenu>
+-<guimenuitem>Show Fileselector</guimenuitem>
++<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>R</keycap></keycombo></shortcut>
++<guimenu>Window</guimenu>
++<guimenuitem>Close Current</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>Toggle the display of the &kate; File Selector</para>
++<para>Closes the active frame. This is disabled, if there is only one frame
++(the main editing area).</para> <para>No documents get closed by closing a
++frame &ndash; they will still be available in the <link
++linkend="document-menu"><guimenu>Documents</guimenu> Menu</link> as well as in
++the File List.</para> <para>See also <link linkend="kate-mdi">Working with the
++&kate; MDI</link></para>
+ </listitem>
+ </varlistentry>
+ 
++<varlistentry id="window-next-view">
++<term><menuchoice><shortcut><keycombo action="simul"><keycap>F8</keycap>
++</keycombo></shortcut><guimenu>Window</guimenu><guimenuitem>Next
++View</guimenuitem></menuchoice></term>
++<listitem><para>Focus the next document view, if you have split the editor area
++in more views.</para></listitem>
++</varlistentry>
++
++<varlistentry id="window-previous-view">
++<term><menuchoice><shortcut><keycombo action="simul">&Shift;<keycap>F8</keycap>
++</keycombo></shortcut><guimenu>Window</guimenu><guimenuitem>Previous
++View</guimenuitem></menuchoice></term>
++<listitem><para>Focus the previous document view, if you have split the editor
++area in more views.</para></listitem>
++</varlistentry>
++
+ <varlistentry>
++<term><menuchoice><guimenu>Window</guimenu><guisubmenu>Tool Views</guisubmenu>
++</menuchoice></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><anchor id="window-toolviews-show-sidebars"/>
++<menuchoice><guimenu>Window</guimenu><guisubmenu>Tool Views</guisubmenu>
++<guimenuitem>Show/Hide Sidebars</guimenuitem></menuchoice></term>
++<listitem><para>Toggles the display of the sidebar button rows. This command
++does not affect the display of the sidebar content widgets, any sidebar that
++is visible will stay visible, and if you assigned shortcuts to the below
++commands those will of course continue to work.</para></listitem>
++</varlistentry>
++
++<varlistentry>
+ <term>
+-<anchor id="settings-show-konsole"/>
++<anchor id="window-toolviews-show-filelist"/>
+ <menuchoice>
+-<shortcut><keycombo action="simul"><keycap>F7</keycap></keycombo></shortcut>
+-<guimenu>Settings</guimenu>
+-<guimenuitem>Show Konsole</guimenuitem>
++<guimenu>Window</guimenu><guisubmenu>Tool Views</guisubmenu>
++<guimenuitem>Show Documents</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>Toggles the display of the built in terminal emulator.</para>
+-<para>When activated the first time, the terminal will be created.</para>
+-<para>When the terminal emulator is displayed, it will get the focus, so that you can start
+-typing in commands immediately. If the <link linkend="config-dialog-general-sync-konsole">Sync Konsole with Active
+-Document</link> option is enabled in the <link linkend="config-dialog-general">General Page</link> of the
+-<link linkend="config-dialog">Main configuration dialog</link>
+-the shell session will change to the directory of the active document, if it is a local file.</para>
++<para>Toggle the display of &kate;'s Documents list</para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+ <term>
+-<anchor id="settings-configure-shortcuts"/>
++<anchor id="window-toolviews-show-fileselector"/>
+ <menuchoice>
+-<guimenu>Settings</guimenu>
+-<guimenuitem>Configure Shortcuts</guimenuitem>
++<guimenu>Window</guimenu><guisubmenu>Tool Views</guisubmenu>
++<guimenuitem>Show/Hide Filesystem Browser</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>Display the the familiar &kde; Keyboard Shortcut Configuration Dialog.</para>
++<para>Toggle the display of &kate;'s Filesystem Browser</para>
+ </listitem>
+ </varlistentry>
+ 
+-
+ <varlistentry>
+ <term>
+-<anchor id="settings-configure-toolbars"/>
++<anchor id="window-toolviews-greptool"/>
+ <menuchoice>
+-<guimenu>Settings</guimenu>
+-<guimenuitem>Configure Toolbars</guimenuitem>
++<guimenu>Window</guimenu><guisubmenu>Tool Views</guisubmenu>
++<guimenuitem>Show/Hide Find in Files</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>Display the the familiar &kde; Toolbar Configuration Dialog.</para>
++<para>Toggle the display of &kate;'s <guilabel>Find in Files</guilabel> tool.
++</para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+ <term>
+-<anchor id="settings-configure-kate"/>
++<anchor id="window-toolviews-show-konsole"/>
+ <menuchoice>
+-<guimenu>Settings</guimenu>
+-<guimenuitem>Configure &kate;</guimenuitem>
++<guimenu>Window</guimenu><guisubmenu>Tool Views</guisubmenu>
++<guimenuitem>Show/Hide Terminal</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>Launch the <link linkend="config-dialog">Main Configuration Dialog</link></para>
++<para>Toggles the display of the built in terminal emulator.</para>
++<para>When activated the first time, the terminal will be created.</para>
++<para>When the terminal emulator is displayed, it will get the focus, so that
++you can start typing in commands immediately. If the <link
++linkend="config-dialog-general-sync-konsole">Sync Konsole with Active
++Document</link> option is enabled in the <link
++linkend="config-dialog-general">General Page</link> of the <link
++linkend="config-dialog">Main configuration dialog</link> the shell session will
++change to the directory of the active document, if it is a local file.</para>
+ </listitem>
+ </varlistentry>
+ 
++</variablelist>
+ 
++</listitem>
++</varlistentry>
++
+ </variablelist>
+ 
+ </sect1>
+@@ -1081,15 +1426,10 @@
+ 
+ <title>The <guimenu>Help</guimenu> Menu</title>
+ 
+-<para><!--Surprisingly enough, //-->The <guimenu>Help</guimenu> menu provides
+-access to the online help available for &kate;; as well as to the usual about
+-dialogs.</para>
++<para>Apart from standard &kde; <guimenu>Help</guimenu> menu items
++described below you will have menu entries to show the
++Plugins User Manuals for installed plugins.</para>
+ 
+-<para>As well as the standard &kde; <guimenu>Help</guimenu> menu items
+-described below, if you have installed the kdeaddons package with
+-additional &kate; plugins, you will have a menu entry to show the
+-Plugins User Manuals.</para>
+-
+ &help.menu.documentation;
+ 
+ </sect1>
+--- doc/quickstart/index.docbook	(revision 488815)
++++ doc/quickstart/index.docbook	(revision 494868)
+@@ -15,7 +15,7 @@
+ <authorgroup>
+ 
+ <author>
+-<surname>The KDE Team</surname>
++<surname>The &kde; Team</surname>
+ </author>
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+@@ -25,7 +25,7 @@
+ 
+ <copyright>
+ <year>1999</year><year>2000</year><year>2001</year><year>2002</year>
+-<holder>The KDE Team</holder>
++<holder>The &kde; Team</holder>
+ </copyright>
+ 
+ <legalnotice>&FDLNotice;</legalnotice>
+@@ -192,7 +192,7 @@
+ <para> 
+ This button is called the &kmenu;. It has
+ a small arrow on the top to indicate that it will pop up a menu if you
+-click on it. Just do it! The pop-up offers you easy access to all &kde;
++click on it. Just do it! The popup offers you easy access to all &kde;
+ applications installed on your computer system.
+ </para>
+ 
+@@ -274,9 +274,9 @@
+ </para>
+ 
+ <para>
+-Perhaps you just don't like the panel extending the full width of the
++Perhaps you just do not like the panel extending the full width of the
+ screen.  That's easily changed!  &RMB; on an empty space in the panel,
+-and choose <menuchoice><guimenuitem>Configure Panel...</guimenuitem></menuchoice>.  In the &kcontrol;
++and choose <menuchoice><guimenuitem>Configure Panel...</guimenuitem></menuchoice>.  In the &kcontrolcenter;
+ dialog that pops up, you can choose <guilabel>Length</guilabel> on
+ the <guilabel>Appearance</guilabel> tab, and use the slider there to set
+ the panel to less than 100% width.
+@@ -366,7 +366,7 @@
+ <userinput><command>gg:</command><replaceable>word or
+ words</replaceable></userinput>.  There are a whole lot more of these
+ shortcut commands, and you can even add your own!  Take a look in
+-&kcontrol;, in the tab <menuchoice><guilabel>Web Browsing</guilabel>
++&kcontrolcenter;, in the tab <menuchoice><guilabel>Web Browsing</guilabel>
+ 	<guilabel>Enhanced Browsing</guilabel></menuchoice>.
+ </para>
+ </tip>
+@@ -435,7 +435,7 @@
+ <term>Maximize a window</term>
+ <listitem>
+ <para>
+-Click the maximize button in the title bar (in the default decoration it
++Click the maximize button in the titlebar (in the default decoration it
+ is the square, next to the X) to make the window fill the screen, or if
+ the window is already maximized, to shrink it back to its original
+ size.  Clicking with the &MMB; maximizes the window vertically, and with
+@@ -448,7 +448,7 @@
+ <term>Iconify a window</term>
+ <listitem>
+ <para>
+-Click the iconify button in the title bar (next to Maximize) to hide the
++Click the iconify button in the titlebar (next to Maximize) to hide the
+ window.  Restore it by clicking on the window's icon in the
+ taskbar.
+ </para>
+@@ -469,10 +469,10 @@
+ </variablelist>
+ 
+ <sect2>
+-<title>Title bar buttons</title>
++<title>Titlebar buttons</title>
+ 
+ <para>
+-&kde; windows have some pretty standard buttons on their title bars which
++&kde; windows have some pretty standard buttons on their titlebars which
+ give you fast access to some common operations. The default button
+ layout looks like this:
+ </para>
+@@ -537,8 +537,8 @@
+ activate it. This is called <quote>Focus Follows Mouse</quote>. If you
+ select this policy using the <link linkend="configure">&kde; Control
+ Center</link>, the window under the mouse pointer is always the active
+-one. It doesn't necessarily come to the front automatically, but you
+-can still click on to the title bar or the border of a window or, a
++one. It does not necessarily come to the front automatically, but you
++can still click on to the titlebar or the border of a window or, a
+ &kde; special, you can use the &Alt; key and click the &MMB;
+ anywhere on the window to raise it.
+ </para>
+@@ -679,7 +679,7 @@
+ The sticky button can also be used to move a window from one virtual
+ desktop to another one: push the sticky pin on the window, switch to a
+ different desktop, and release the pin by pushing it again. You can
+-achieve the same result by using the context pop-up menu of the
++achieve the same result by using the context popup menu of the
+ window's entry in the taskbar (menu item <guimenuitem>To Current
+ Desktop</guimenuitem>) or the <guimenuitem>To Desktop</guimenuitem>
+ option on the window operations menu.
+@@ -692,10 +692,10 @@
+ <title>Managing your files</title>
+ 
+ <!-- NB Deliberate use of 'directory' rather than 'folder', since we're talking -->
+-<!-- about directories on disk -->
++<!-- about folders on disk -->
+ <para>
+ A common metaphor of graphical desktops is the use of folders to
+-represent directories on your hard disk. Folders contain files and
++represent folders on your hard disk. Folders contain files and
+ other folders. A &kde; application called &konqueror;, the K File
+ Manager, uses this metaphor to help you manage your files.
+ </para>
+@@ -708,7 +708,7 @@
+ appears. This is a &konqueror; window displaying the files in your
+ home folder (the area where your personal files are stored). The
+ pathname of the folder is displayed under the window's tool bar. If
+-you don't see such a window now, click the icon on the panel that
++you do not see such a window now, click the icon on the panel that
+ looks like a folder with a picture of a house.
+ </para>
+ 
+@@ -728,7 +728,7 @@
+ &kde; comes with a set of applications to view and edit files of many
+ common types, and when you click a file containing, say, a document
+ or image, &konqueror; will start the appropriate application to
+-display the file. If it doesn't know what application to start to open
++display the file. If it does not know what application to start to open
+ a file you clicked, &konqueror; will prompt you for the name of the
+ application to run, and when you have chosen, &konqueror; will offer
+ to remember your choice for the next time you open a file of that type.
+@@ -1014,7 +1014,7 @@
+ can change almost every aspect of the appearance and the behavior of
+ your desktop. Unlike many other &UNIX; desktop environments, you do not
+ have to edit cryptic configuration files either (but you can if you
+-really want to!)  You use the &kcontrol;, a special program for
++really want to!)  You use the &kcontrolcenter;, a special program for
+ configuring your desktop.
+ </para>
+ 
+@@ -1022,7 +1022,7 @@
+ <title>Using the <application>&kde; Control Center</application></title>
+ 
+ <para>
+-Launch the &kcontrol; from the <link linkend="starter">&kmenu;</link>.
++Launch the &kcontrolcenter; from the <link linkend="starter">&kmenu;</link>.
+ A window with two panes appears, displaying a list of
+ modules in the left pane.
+ </para>  
+@@ -1088,7 +1088,7 @@
+ <para>
+ If you make changes on one configuration panel and move to a different module
+ without clicking <guibutton>OK</guibutton> or <guibutton>Apply</guibutton>
+-first, &kcontrol; will prompt you to ask whether your changes should be applied
++first, &kcontrolcenter; will prompt you to ask whether your changes should be applied
+ first.
+ </para>
+ </note>
+@@ -1185,7 +1185,7 @@
+ 
+ <!--
+ 2004-08-27
+-Removed because it probably shouldn't be here, and it'll only end up
++Removed because it probably should not be here, and it will only end up
+ getting out-of-date if it is (Phil)
+ <chapter id="advanced-topics">
+ <title>Advanced Topics</title>
+@@ -1295,7 +1295,7 @@
+ that on &UNIX; systems the file extension often bears little or no
+ relation to the contents of the file.  On the other hand, it may be
+ vital - for example, some implementations of <command>gunzip</command>
+-won't operate on files that aren't named <literal
++will not operate on files that are not named <literal
+ role="extension">.gz</literal>.
+ </para>
+ 
+--- doc/kcontrol/language/index.docbook	(revision 488815)
++++ doc/kcontrol/language/index.docbook	(revision 494868)
+@@ -160,9 +160,9 @@
+   clock, using two digits (00 to 23).</para></listitem>
+   <listitem><para><parameter>hH</parameter> - The hour according to a 24-hour
+   clock, using one or two digits (0 to 23).</para></listitem>
+-  <listitem><para><parameter>PH</parameter> (uppercase eye) - The hour according
++  <listitem><para><parameter>PH</parameter> (uppercase <quote>p</quote>) - The hour according
+   to a 12-hour clock, using two digits (01 to 12).</para></listitem>
+-  <listitem><para><parameter>pH</parameter> (lowercase ell) - The hour according
++  <listitem><para><parameter>pH</parameter> (lowercase <quote>p</quote>) - The hour according
+   to a 12-hour clock, using one or two digits (1 to 12).</para></listitem>
+   <listitem><para><parameter>MM</parameter> - The current minute using two digits
+   (00 to 59).</para></listitem>
+--- doc/kcontrol/panelappearance/index.docbook	(revision 488815)
++++ doc/kcontrol/panelappearance/index.docbook	(revision 494868)
+@@ -61,14 +61,14 @@
+ 
+ <para><guilabel>Enable transparency</guilabel> to turn the entire
+ panel transparent.  The desktop background will show through instead
+-of a solid color panel.</para>
++of a background image or color.</para>
+ 
+ <para>There will still be small handles beside each applet, to allow
+ you to locate, move, and configure them.  These can be turned off in
+ the <guilabel>Advanced Options</guilabel></para>
+ 
+ <para>If you check <guilabel>Enable background image</guilabel> a
+-picture that will be used to draw the panel's background, just as you
++picture will be used to draw the panel's background, just as you
+ can use a picture for the desktop background. You can specify an image
+ file in the line edit box below or choose one by clicking on the
+ <guibutton>Browse</guibutton> button. You'll see a preview of the
+--- doc/kcontrol/kcmstyle/index.docbook	(revision 488815)
++++ doc/kcontrol/kcmstyle/index.docbook	(revision 494868)
+@@ -43,7 +43,7 @@
+ url="help:/kcontrol/color/index.html">Colors</ulink>.</para>
+ 
+ <para>This panel is divided into three tabs:  <guilabel>Style</guilabel>, 
+-<guilabel>Effects</guilabel>, <guilabel>Miscellaneous</guilabel>.</para>
++<guilabel>Effects</guilabel>, <guilabel>Toolbar</guilabel>.</para>
+ 
+ <sect3 id="style-style">
+ <title><guilabel>Style</guilabel> tab</title>
+@@ -62,9 +62,9 @@
+ <term><guilabel>Show icons on buttons</guilabel></term>
+ <listitem>
+ <para>If this option is selected, action buttons (like <guibutton>OK</guibutton> and 
+-<guibutton>Apply</guibutton> will have a small icon located within them to act as a 
+-visual reference.  If this option is not selected, then only the text of the button will 
+-appear in the button.</para>
++<guibutton>Apply</guibutton>) will have a small icon located within them to act
++as a visual reference.  If this option is not selected, then only  text
++will appear on the button.</para>
+ </listitem> 
+ </varlistentry> 
+ 
+@@ -173,13 +173,8 @@
+ <term><guilabel>Text position</guilabel></term>
+ <listitem>
+ <para>This combo box lets you determine where on the button the text name of the button will appear as the default.  
+-If <guilabel>Icon Only</guilabel> is selected, then there is no text on the tool bar buttons.  If 
+-<guilabel>Text Only</guilabel> is selected, then the buttons icon is replaced with a text name of 
+-the button. If <guilabel>Text Alongside Icons</guilabel> is selected, then the name of the button will be 
+-placed to the <emphasis>right</emphasis> of the icon. If <guilabel>Text Under Icons</guilabel> is selected, the default 
+-will be to have the text of the button <emphasis>below</emphasis> the icon.</para>
+-<tip><para>This option only specifies the <emphasis>default</emphasis> location.  Each application can 
+-override the setting used in this panel.</para></tip>
++If <guilabel>Icon Only</guilabel> is selected, then there is no text on the toolbar buttons.  If  <guilabel>Text Only</guilabel> is selected, then the button's icon is replaced with a text name of  the button. If <guilabel>Text Alongside Icons</guilabel> is selected, then the name of the button will be placed to the <emphasis>right</emphasis> of the icon. If <guilabel>Text Under Icons</guilabel> is selected, the default will be to have the text of the button <emphasis>below</emphasis> the icon.</para>
++<tip><para>This option only specifies the <emphasis>default</emphasis> location.  Each application can override the setting used in this panel.</para></tip>
+ </listitem> 
+ </varlistentry> 
+ 
+--- doc/kcontrol/kcmaccess/index.docbook	(revision 488815)
++++ doc/kcontrol/kcmaccess/index.docbook	(revision 494868)
+@@ -13,7 +13,7 @@
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+ 
+-<date>2002-09-01</date>
++<date>2005-12-21</date>
+ <releaseinfo>3.01.00</releaseinfo>
+ 
+ <keywordset>
+@@ -134,11 +134,12 @@
+ <term>With <guilabel>Lock Sticky Keys</guilabel> enabled:</term>
+ <listitem>
+ <para>
+-The user presses the &Shift; key, then presses the <keycap>F</keycap> key.
++The user presses the &Shift; key <emphasis>twice</emphasis>, then presses the <keycap>F</keycap> key.
+ The computer translates this into <keycombo
+ action="simul">&Shift;<keycap>F</keycap></keycombo>.  Now if the user
+ types a <keycap>p</keycap>, the computer interprets this as the letter P
+-(<keycombo action="simul">&Shift;<keycap>P</keycap></keycombo>).
++(<keycombo action="simul">&Shift;<keycap>P</keycap></keycombo>). To
++de-select the &Shift; key, press it again.
+ </para>
+ </listitem>
+ </varlistentry>
+--- doc/kcontrol/performance/index.docbook	(revision 488815)
++++ doc/kcontrol/performance/index.docbook	(revision 494868)
+@@ -52,7 +52,7 @@
+ 
+ <varlistentry>
+ <term>For file browsing only (recommended)</term>
+-<listitem><para>If this option is selected, you can have as many &konqueror; instances open that are browsing the web, but only one instance of &konqueror; for file management.  </para></listitem>
++<listitem><para>If this option is selected, you can have as many as you want &konqueror; instances open that are browsing the web, but only one instance of &konqueror; for file management.  </para></listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+@@ -68,7 +68,7 @@
+  because most of the application has been preloaded.  The negative effect is that this instance of &konqueror; uses memory that 
+ could be used by other programs. By default, when a user closes &konqueror;, &kde; does not close the instance.
+ This means that the next time a user wants &konqueror; loaded, it is nearly instantanous again.</para>
+-<para>The spinbox labeled <guilabel>Maximum number of instances kept preloaded:</guilabel> can be used to adjust the maximum number of preloaded instances.  This option does not affect when they are loaded.  It also does not limit the number of instances that can be used by active windows.  It only affects the number of preloaded instances.</para>
++<para>The spinbox labeled <guilabel>Maximum number of instances kept preloaded:</guilabel> can be used to adjust the maximum number of preloaded instances.  This option does not affect instances when they are loaded.  It also does not limit the number of instances that can be used by active windows.  It only affects the number of preloaded instances.</para>
+ <para>The checkbox labeled <guilabel>Preload an instance after &kde; startup</guilabel> does just what it says.  It tells 
+ &kde; to preload one instance of &konqueror; at the startup of &kde;.</para>
+ <note><para>This does extend the startup time for &kde;.</para></note>
+--- doc/kcontrol/kdm/index.docbook	(revision 488815)
++++ doc/kcontrol/kdm/index.docbook	(revision 494868)
+@@ -36,7 +36,7 @@
+ computer.</para>
+ 
+ <para>In order to organize all of these options, this module is
+-divided into five sections: <link
++divided into six sections: <link
+ linkend="kdmconfig-appearance"><guilabel>Appearance</guilabel></link>,
+ <link linkend="kdmconfig-font"><guilabel>Font</guilabel></link>, <link
+ linkend="kdmconfig-background"><guilabel>Background</guilabel></link>,
+--- doc/userguide/panel-and-desktop.docbook	(revision 488815)
++++ doc/userguide/panel-and-desktop.docbook	(revision 494868)
+@@ -108,13 +108,13 @@
+ 
+ <!-- Simon Vermeersch -->
+ <para>The system tray is where programs that are run, but not directly needed are
+-keeped. Some programs (like music players) are shown there, because you
+-probably wants to keep them open, but so that it don't take too much space on
++kept. Some programs (like music players) are shown there, because you
++probably want to keep them open, but so that it does not take too much space on
+ your screen, it will put an icon in the system tray.</para>
+ 
+ <para>When you <mousebutton>right</mousebutton> click on such an icon, a
+ popup menu will appear where you can see some options of the program (like
+-play, pause, stop, ... in a music player)</para>
++play, pause, stop, ... in a music player).</para>
+ <para>When you <mousebutton>left</mousebutton> click on it, the main window
+ of the program will appear. If you hover your mouse above the icon, a tool
+ tip will appear with some information (in the music player case information
+@@ -133,7 +133,7 @@
+ <!-- easy to describe (and also very small - possible -->
+ <!-- accessibility/usability issue? -->
+ <para>You can remove applets and other special items from the panel
+-using the arrow on its handle on the applet's left. Click on the
++using the arrow on its handle on the applet's left. Right click on the
+ arrow, and choose <guimenuitem>Remove <replaceable>applet
+ name</replaceable></guimenuitem>.</para>
+ </sect2>
+@@ -245,7 +245,7 @@
+ <menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>C</keycap>
+ </keycombo>
+ </shortcut><guimenu>Edit</guimenu><guimenuitem>Copy</guimenuitem>
+-</menuchoice>, and the text will be removed from its current location.</para>
++</menuchoice>, and the text will be copied in the clipboard.</para>
+ </listitem>
+ <listitem><para>Position the text cursor at the point you want to
+ insert the text. This can be in the same application you got the text
+--- doc/userguide/index.docbook	(revision 488815)
++++ doc/userguide/index.docbook	(revision 494868)
+@@ -59,7 +59,7 @@
+ 
+ <authorgroup>
+ <corpauthor>
+-The KDE Documentation Team
++The &kde; Documentation Team
+ </corpauthor>
+ 
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+@@ -67,7 +67,7 @@
+ 
+ <copyright>
+ <year>2004</year><year>2005</year>
+-<holder>The KDE Documentation Team</holder>
++<holder>The &kde; Documentation Team</holder>
+ </copyright>
+ 
+ <legalnotice>&FDLNotice;</legalnotice>
+@@ -215,8 +215,8 @@
+ 
+ <varlistentry>
+ <term>&kde; prefix</term>
+-<listitem><para>&kde; installs into its own directory tree, which you can find by
+-running the command <userinput><command>kde-config</command> <option>--prefix</option></userinput>. This directory is referred to
++<listitem><para>&kde; installs into its own folder tree, which you can find by
++running the command <userinput><command>kde-config</command> <option>--prefix</option></userinput>. This folder is referred to
+ by the environment variables  $<envar>KDEDIRS</envar> and possibly
+ $<envar>KDEDIR</envar>.</para>
+ </listitem>
+@@ -225,7 +225,7 @@
+ <varlistentry>
+ <term>&kde; user-specific settings</term>
+ <listitem><para>The environment variable $<envar>KDEHOME</envar>
+-points to the directory where &kde; should find user-specific settings.  If it is not
++points to the folder where &kde; should find user-specific settings.  If it is not
+ set, the default value of <filename
+ class="directory">~/.kde</filename> is used.</para>
+ </listitem>
+@@ -387,7 +387,7 @@
+ <para>If you prefer using the command line, you can log in to &kde;
+ with the <command>startx</command> command. Add the line
+ <userinput>exec startkde</userinput> to the
+-<filename>.xinitrc</filename> file in your home directory (create it
++<filename>.xinitrc</filename> file in your home folder (create it
+ if it does not exist), save the file, and then run
+ <command>startx</command>. &kde; should start in the same way as if
+ you had logged in graphically.</para>
+@@ -578,6 +578,9 @@
+ 
+ <sect1 id="license">
+ <title>License</title>
++
++<!-- TRANS:CREDIT_FOR_TRANSLATORS -->
++
+ &underFDL;
+ </sect1>
+ 
+--- doc/userguide/net-connection-setup.docbook	(revision 488815)
++++ doc/userguide/net-connection-setup.docbook	(revision 494868)
+@@ -61,7 +61,7 @@
+ <itemizedlist>
+ <listitem><para>The incoming mail server address (often <systemitem
+ class="systemname">pop.yourisp.com</systemitem> or <systemitem 
+-class="systemname">mail.yourisp.com</systemitem>)</para><para>Also find out if
++class="systemname">mail.yourisp.com</systemitem>).</para><para>Also find out if
+ your <acronym>ISP</acronym> uses the POP3 protocol or IMAP.</para></listitem>
+ <listitem><para>The outgoing (<acronym>SMTP</acronym>) mail server address (it
+ could be the same as the incoming mail server, or it is often called something
+@@ -94,21 +94,21 @@
+ <title>Starting the Wizard.</title>
+ 
+ <para>You can start the wizard from &kppp;'s initial screen.  Start &kppp; from
+-your <guimenu>K</guimenu> menu, where you will find it's entry in the
++your <guimenu>K</guimenu> menu, where you will find its entry in the
+ <guisubmenu>Internet</guisubmenu> as <guimenuitem>Internet
+ Dialer</guimenuitem>.</para>
+ 
+ <para>The following dialog will appear:</para>
+ 
+ <screenshot>
+-<screeninfo>The &kppp; dialer startup screen</screeninfo>
++<screeninfo>The &kppp; dialer startup dialog</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="kppp-dialer-tab.png" format="PNG"/>
+ </imageobject>
+-<textobject><phrase>The &kppp; dialer startup screen</phrase>
++<textobject><phrase>The &kppp; dialer startup dialog</phrase>
+ </textobject>
+-<caption><para>The &kppp; dialer startup screen</para></caption>
++<caption><para>The &kppp; dialer startup dialog</para></caption>
+ </mediaobject>
+ </screenshot>
+ 
+@@ -138,7 +138,7 @@
+ <term><guibutton>Cancel</guibutton></term>
+ <listitem><para>Choose this if you really don't want to be setting up a new
+ account right now. The message box will go away, and you will be left with the
+-dialer screen as before.</para></listitem>
++dialer window as before.</para></listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+@@ -167,19 +167,19 @@
+ <sect2 id="finishing-the-wizard">
+ <title>The Rest of the Wizard</title>
+ 
+-<para>The first screen you see contains just introductory text, explaining the
+-things you read about in the first section of this chapter.  Press
++<para>The first window you see contains just introductory text, explaining the
++things you read about in the first section of this chapter.  Click
+ <guibutton>Next</guibutton> to move on.</para>
+ 
+-<para>The second screen asks you to choose the country you live in.  Not all
++<para>The second window asks you to choose the country you live in.  Not all
+ countries are represented here, and if the country you live in is not listed,
+-you will have to press <guibutton>Cancel</guibutton>, in which case the Dialog-based setup will start for you to continue
++you will have to click <guibutton>Cancel</guibutton>, in which case the Dialog-based setup will start for you to continue
+ with.</para>
+ 
+-<para>On the next screen, you will be given a choice of Internet
++<para>On the next window, you will be given a choice of Internet
+ Providers that &kppp; knows about, based on your choice of location in
+-the previous screen.  Again, if your <acronym>ISP</acronym> is not
+-listed here, you will have to press <guibutton>Cancel</guibutton> and
++the previous window.  Again, if your <acronym>ISP</acronym> is not
++listed here, you will have to click <guibutton>Cancel</guibutton> and
+ do your setup in the Dialog-based setup</para>
+ 
+ <para>You will now be asked to enter your username and password for your
+@@ -187,17 +187,17 @@
+ differs from your mail account user name and password, so make sure you use the
+ right one. Choose <guibutton>Next</guibutton> to continue.</para>
+ 
+-<para>On the next screen, you have a chance to enter any special dial prefixes
++<para>On the next window, you have a chance to enter any special dial prefixes
+ you might have - for example, if you must dial <quote>0</quote> for an outside
+-line, or if have a prefix you can dial to turn off call waiting.  Choose
++line, or if you have a prefix you can dial to turn off call waiting.  Choose
+ <guibutton>Next</guibutton> to continue.</para>
+ 
+ <para>And that's all!  If you want to revisit any of your choices, you can use
+ the <guibutton>Back</guibutton> and <guibutton>Next</guibutton> buttons to move
+-back and forth through the dialogs.  When you're happy, press the
++back and forth through the dialogs.  When you're done with your settings, click the
+ <guibutton>Finish</guibutton> button, and you're all done.</para>
+ 
+-<para>If this procedure does not work, you can read the full &kppp;
++<para>If you need more details, you can read the full &kppp;
+ manual in the &kde; Help Center, or by typing
+ <userinput>help:/kppp</userinput> in the <guilabel>Location</guilabel>
+ bar in &konqueror;.</para>
+--- doc/userguide/kde-office.docbook	(revision 488815)
++++ doc/userguide/kde-office.docbook	(revision 494868)
+@@ -152,8 +152,8 @@
+ 	<listitem><para>The textprocessing component, but it includes many aspects of a desktop publishing application. This creates a rather unique mixture of features that makes interesting layouts easily possible.</para>
+ 	
+ 		<itemizedlist>
+-			<listitem><para>Website: <ulink url="http://koffice.kde.org/kword/">http://koffice.kde.org/kword/</ulink></para></listitem>
+-			<listitem><para><ulink url="help:/koffice">&koffice; Handbook</ulink></para></listitem>
++			<listitem><para>Website: <ulink url="http://www.koffice.org/kword/">http://www.koffice.org/kword/</ulink></para></listitem>
++			<listitem><para><ulink url="help:/kword">&kword; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+ 	</listitem>
+@@ -164,7 +164,7 @@
+ 	<listitem><para>The spreadsheet component. &kspread; is a scriptable spreadsheet program which provides both table-oriented sheets and support for complex mathematical formulas and statistics. Features include Hyperlinks, cell data validity checking with configurable warnings/actions, scripting and specific cell customization. </para>
+ 	
+ 		<itemizedlist>
+-			<listitem><para>Website: <ulink url="http://koffice.kde.org/kspread/">http://koffice.kde.org/kspread/</ulink></para></listitem>
++			<listitem><para>Website: <ulink url="http://www.koffice.org/kspread/">http://www.koffice.org/kspread/</ulink></para></listitem>
+ 			<listitem><para><ulink url="help:/kspread">&kspread; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+@@ -176,7 +176,7 @@
+ 	<listitem><para>The presentation component. It can be used to create on-screen presentations or to design and print transparencies. Features include embedding images and clip-art, easy working with objects, and the ability to make &HTML; or &XML; slideshows.</para>
+ 	
+ 		<itemizedlist>
+-			<listitem><para>Website: <ulink url="http://koffice.kde.org/kpresenter/">http://koffice.kde.org/kpresenter/</ulink></para></listitem>
++			<listitem><para>Website: <ulink url="http://www.koffice.org/kpresenter/">http://www.koffice.org/kpresenter/</ulink></para></listitem>
+ 			<listitem><para><ulink url="help:/kpresenter">&kpresenter; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+@@ -188,7 +188,7 @@
+ 	<listitem><para>The flowcharting and diagramming component. Additional stencil sets can be used for custom needs, there is a plugin framework for additional functionality, and even <acronym>UML</acronym> diagrams are possible.</para>
+ 	
+ 		<itemizedlist>
+-			<listitem><para>Website: <ulink url="http://koffice.kde.org/kivio/">http://koffice.kde.org/kpresenter/</ulink></para></listitem>
++			<listitem><para>Website: <ulink url="http://www.koffice.org/kivio/">http://www.koffice.org/kivio/</ulink></para></listitem>
+ 			<listitem><para><ulink url="help:/kivio">&kivio; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+@@ -205,7 +205,7 @@
+ 	<listitem><para>The painting and image manipulation component. &krita; contains both ease-of-use, fun features like guided painting, as well as high-end features like support for 16-bit images, <acronym>CMYK</acronym> and even OpenEXR <acronym>HDR</acronym> images.  </para>
+ 	
+ 		<itemizedlist>
+-			<listitem><para>Website: <ulink url="http://koffice.kde.org/krita/">http://koffice.kde.org/krita/</ulink></para></listitem>
++			<listitem><para>Website: <ulink url="http://www.koffice.org/krita/">http://www.koffice.org/krita/</ulink></para></listitem>
+ 			<listitem><para><ulink url="help:/krita">&krita; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+@@ -217,7 +217,7 @@
+ 	<listitem><para>The appropriate component for creating business reports, which is accomplished with an advanced designer that it has. Features include report printing in postscript, full control of fonts, colors, text alignment and wrapping, as well as open report definition files (with the layout stored as &XML;).</para>
+ 	
+ 		<itemizedlist>
+-			<listitem><para>Website: <ulink url="http://koffice.kde.org/kugar/">http://koffice.kde.org/kugar/</ulink></para></listitem>
++			<listitem><para>Website: <ulink url="http://www.koffice.org/kugar/">http://www.koffice.org/kugar/</ulink></para></listitem>
+ 			<listitem><para><ulink url="help:/kugar">&kugar; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+@@ -229,7 +229,7 @@
+ 	<listitem><para>The component for project management, allowing for the planning and scheduling of various projects.</para>
+ 	
+ 		<itemizedlist>
+-			<listitem><para>Website: <ulink url="http://koffice.kde.org/kplato/">http://koffice.kde.org/kplato/</ulink></para></listitem>
++			<listitem><para>Website: <ulink url="http://www.koffice.org/kplato/">http://www.koffice.org/kplato/</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+ 	</listitem>
+@@ -237,10 +237,10 @@
+ 
+ <varlistentry>
+ <term>&kexi;</term>
+-	<listitem><para>The data management component. It can be used for creating database schemas, inserting data, performing queries, and processing data. Forms can be created to provide a custom interface to your data. All database objects -- tables, queries and forms -- are stored in the database, making it easy-to-share data and design.</para>
++	<listitem><para>The data management component. It can be used for creating database schemas, inserting data, performing queries, and processing data. Forms can be created to provide a custom interface to your data. All database objects -- tables, queries and forms -- are stored in the database, making it easy to share data and database design.</para>
+ 	
+ 		<itemizedlist>
+-			<listitem><para>Website: <ulink url="http://koffice.kde.org/kexi/">http://koffice.kde.org/kexi/</ulink> and <ulink url="http://kexi-project.org">http://kexi-project.org</ulink>.</para></listitem>
++			<listitem><para>Website: <ulink url="http://www.koffice.org/kexi/">http://www.koffice.org/kexi/</ulink> and <ulink url="http://kexi-project.org">http://kexi-project.org</ulink>.</para></listitem>
+ 			<listitem><para><ulink url="help:/kexi">&kexi; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+@@ -249,10 +249,10 @@
+ 
+ <varlistentry>
+ <term>&kchart;</term>
+-	<listitem><para>The chart drawing component; it is used to embed charts into one of the other &koffice; components. It's easy-to-use, highly customizable allowing all of the parameters to be changed, and has a flexible layout. </para>
++	<listitem><para>The chart drawing component; it is used to embed charts into one of the other &koffice; components. It's easy to use, highly customizable allowing all of the parameters to be changed, and has a flexible layout. </para>
+ 	
+ 		<itemizedlist>
+-			<listitem><para>Website: <ulink url="http://koffice.kde.org/kchart/">http://koffice.kde.org/kchart/</ulink></para></listitem>
++			<listitem><para>Website: <ulink url="http://www.koffice.org/kchart/">http://www.koffice.org/kchart/</ulink></para></listitem>
+ 			<listitem><para><ulink url="help:/kchart">&kchart; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+@@ -264,7 +264,7 @@
+ 	<listitem><para> A formula editor which provides the basic input facilities and support functionality that appears in other &koffice; applications. Some of its features include intelligent cursor management, multi-level undo support and advanced syntax highlighting.</para>
+ 	
+ 		<itemizedlist>
+-			<listitem><para>Website: <ulink url="http://koffice.kde.org/kformula/">http://koffice.kde.org/kformula/</ulink></para></listitem>
++			<listitem><para>Website: <ulink url="http://www.koffice.org/kformula/">http://www.koffice.org/kformula/</ulink></para></listitem>
+ 			<listitem><para><ulink url="help:/kformula">&kformula; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+@@ -275,7 +275,7 @@
+ 
+ <itemizedlist>
+ <title>Related Information</title>
+-	<listitem><para>Main website: <ulink url="http://koffice.kde.org">http://koffice.kde.org</ulink>.</para></listitem>
++	<listitem><para>Main website: <ulink url="http://www.koffice.org">http://www.koffice.org</ulink>.</para></listitem>
+ 	<listitem><para><ulink url="help:/koffice">&koffice; Handbook</ulink></para></listitem>
+ </itemizedlist>
+ 
+@@ -290,7 +290,7 @@
+ These manuals offer all the latest information about the
+ various components &koffice; has to offer and should be
+ read to learn more about &koffice;. The application manuals can be accessed by using the documentation KIO Slave in &konqueror; (that is, typing <userinput>help:/<replaceable>application</replaceable></userinput> into the Location toolbar) or by selecting the respective handbook from the &khelpcenter;. The website is
+-also a good place to find out more; it is at <ulink url="http://koffice.kde.org">http://koffice.kde.org</ulink>.</para>
++also a good place to find out more; it is at <ulink url="http://www.koffice.org">http://www.koffice.org</ulink>.</para>
+ </sect1>
+ 
+ <sect1 id="kde-office-internet">
+--- doc/userguide/kde-for-admins.docbook	(revision 488815)
++++ doc/userguide/kde-for-admins.docbook	(revision 494868)
+@@ -793,15 +793,34 @@
+ :0 local /usr/X11R6/bin/X :0 vt07
+ </programlisting>
+ 
+-<para>See also [X-*-Core] section in kdmrc
+-Setup - /etc/X11/xdm/Xsetup
++<para>Relevant startup files are also: </para>
++<simplelist>
++<member>
++[X-*-Core] section in <filename>kdmrc</filename>
++</member>
++<member>
++Setup - <filename>/etc/X11/xdm/Xsetup</filename>
++</member>
++<member>
+ User enters username &amp; password
+-Startup - /etc/X11/xdm/Xstartup - prepare as root
+-Session - /etc/X11/xdm/Xsession - starts session as user
+-= For a KDE session: kde or startkde
+-= If present ~/.xsession or ~/.xinitrc
+-Reset - /etc/X11/xdm/Xreset - after session finished
+-</para>
++</member>
++<member>
++Startup - <filename>/etc/X11/xdm/Xstartup</filename> - prepare as root
++</member>
++<member>
++Session - <filename>/etc/X11/xdm/Xsession</filename> - starts session as user
++</member>
++<member>
++= For a KDE session: <command>kde</command> or <command>startkde</command>
++</member>
++<member>
++= If present <filename>~/.xsession</filename> or <filename>~/.xinitrc</filename>
++</member>
++<member>
++Reset - <filename>/etc/X11/xdm/Xreset</filename> - after session finished
++</member>
++</simplelist>
++
+ </sect2>
+ 
+ <sect2 id="startkde">
+--- doc/userguide/extragear-applications.docbook	(revision 488815)
++++ doc/userguide/extragear-applications.docbook	(revision 494868)
+@@ -11,7 +11,7 @@
+ 
+ <title>&kde; Extragear Applications</title>
+ 
+-<para>These are applications that are directly associated with &kde;, the project, but do not appear and are not shipped with the main &kde; distribution. This can be down to a number of reasons, but a commonn case is either down to a duplication of functionality, or because they're simply too specialised. Perhaps the most popular occurence however is that the developers themselves may not want it to appear in the extrager; choosing, rather, to handle their own release schedules. Nevertheless, the applications in Extrager are distinguished by &kde;, and many are increasingly popular. </para>
++<para>These are applications that are directly associated with &kde;, the project, but do not appear and are not shipped with the main &kde; distribution. This can be down to a number of reasons, but a common case is either down to a duplication of functionality, or because they're simply too specialised. Perhaps the most popular occurence however is that the developers themselves may not want it to appear in the main &kde; distribution; choosing, rather, to handle their own release schedules. Nevertheless, the applications in Extragear are distinguished by &kde;, and many are increasingly popular. </para>
+ 
+ <sect1 id="extragear-components">
+ <title>Available in the &kde; Extragear</title>
+@@ -58,7 +58,7 @@
+ <variablelist>
+ <varlistentry>
+ <term>&digikam;</term>
+-	<listitem><para>A photo management application which can conveniently organize and import digital photos. Features include complete tagging functionality, a plugin system, and a fully-featured comment system. &digikam; also makes use of <acronym>KIPI</acronym> (&kde; Image Plugin Interface), therefore contributing to the initiave to create a common plugin infrastructure, which allows development of image plugins that can be shared among graphical applications in &kde; (others include <application>Gwenview</application>, <application>ShowImg</application> and <application>KimDaBa</application>).</para>
++	<listitem><para>A photo management application which can conveniently organize and import digital photos. Features include complete tagging functionality, a plugin system, and a fully-featured comment system. &digikam; also makes use of <acronym>KIPI</acronym> (&kde; Image Plugin Interface), therefore contributing to the initiative to create a common plugin infrastructure, which allows development of image plugins that can be shared among graphical applications in &kde; (others include <application>Gwenview</application>, <application>ShowImg</application> and <application>KimDaBa</application>).</para>
+ 	
+ 		<itemizedlist>
+ 			<listitem><para>Website: <ulink url="http://digikam.org">http://digikam.org</ulink></para></listitem>
+--- doc/userguide/kde-edutainment.docbook	(revision 488815)
++++ doc/userguide/kde-edutainment.docbook	(revision 494868)
+@@ -23,6 +23,7 @@
+ educational software on <ulink url="http://edu.kde.org">the KDE-Edu
+ website</ulink>. What follows is an overview of a few of them.
+ </para>
++<para>View the handbook of each application by typing <userinput>help:/&lt;appname&gt;</userinput> in &konqueror;'s Location Toolbar, or by selecting it in &khelpcenter;. </para>
+ 
+ <sect1 id="languages">
+ <title>Improve your language skills</title>
+@@ -34,7 +35,8 @@
+ 	
+ 		<itemizedlist>
+ 			<listitem><para>Website: <ulink url="http://edu.kde.org/khangman">http://edu.kde.org/khangman</ulink></para></listitem>
+-			<listitem><para>View the handbook by typing <userinput>help:/khangman</userinput> in &konqueror;'s Location Toolbar, or by selecting it in &khelpcenter;.</para></listitem>
++			<listitem><para><ulink
++	url="help:/khangman">&khangman; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+ 	</listitem>
+@@ -54,13 +56,13 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term>&kmessedwords;</term>
++<term>&kanagram;</term>
+ 	<listitem><para>A simple mind-training game, in which you have to figure out the word that has been given in the program. The letters from the word are disordered, and from the given words you have to solve which word the letters might make, if rearranged. Similar to the popular Countdown game as seen on Television.</para>
+ 	
+ 		<itemizedlist>
+-			<listitem><para>Website: <ulink url="http://edu.kde.org/kmessedwords">http://edu.kde.org/kmessedwords</ulink></para></listitem>
++			<listitem><para>Website: <ulink url="http://edu.kde.org/kanagram">http://edu.kde.org/kanagram</ulink></para></listitem>
+ 			<listitem><para><ulink
+-	url="help:/kmessedwords">&kmessedwords; Handbook</ulink></para></listitem>
++	url="help:/kanagram">&kanagram; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+ 	</listitem>
+@@ -280,18 +282,31 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-	<term><application>KGeography</application></term>
+-	<listitem><para></para>
++	<term><application>&kgeography;</application></term>
++	<listitem><para>&kgeography; is a geography learning tool for &kde;. You can browse the maps by clicking in a map division to see its name and you can also answer several types of questions where the program shows you a map division or a capital for example and you have to guess its name.</para>
+ 		
+ 		<itemizedlist>
+ 			<listitem><para>Website: <ulink url="http://kgeography.berlios.de/">http://kgeography.berlios.de/</ulink> and <ulink url="http://edu.kde.org/kgeography">http://edu.kde.org/kgeography</ulink></para></listitem>
+-			<listitem><para><ulink url="help:/kgeography"><application>KGeography</application> Handbook</ulink></para></listitem>
++			<listitem><para><ulink url="help:/kgeography"><application>&kgeography;</application> Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+ 	</listitem>
+ 
+ </varlistentry>
+ 
++<varlistentry>
++	<term><application>&blinken;</application></term>
++	<listitem><para>&blinken; is a Simon Says game for &kde;. The player should remember the sequence of lights in the correct order and is then presented with an identical sequence with one extra step.</para>
++		
++		<itemizedlist>
++			<listitem><para>Website: <ulink url="http://edu.kde.org/blinken">http://edu.kde.org/blinken</ulink></para></listitem>
++			<listitem><para><ulink url="help:/blinken"><application>&blinken;</application> Handbook</ulink></para></listitem>
++		</itemizedlist>
++		
++	</listitem>
++
++</varlistentry>
++
+ </variablelist>
+ </sect1>
+ 
+--- doc/userguide/networking-with-windows.docbook	(revision 488815)
++++ doc/userguide/networking-with-windows.docbook	(revision 494868)
+@@ -12,9 +12,9 @@
+ <title>Networking With Windows</title>
+ 
+ <para> This section is borrowed and modified from Alexander Neundorf's
+-README file on LISa</para>
++README file on LISa.</para>
+ 
+-<para>&kde; features a powerful server called the Lan Information
++<para>&kde; features two powerful servers called the Lan Information
+ Server (<application>LISa</application>) and Restricted Lan
+ Information Server (<application>resLISa</application>) which are used
+ to identify CIFS and other servers on your local network providing a
+@@ -31,10 +31,10 @@
+ configuration file that &lisa; will check.  When you start the &lisa; daemon
+ it will send a <ulink url="http://www.ietf.org/rfc/rfc792.txt">ICMP</ulink>,
+ echo request message to all the IP addresses given in the configuration file
+-and await a response..</para>
++and await a response.</para>
+ 
+-<note><para>The &lisa; daemon requires root privledges to open the socket,
+-but once the socket has been established root privledges are immediately
++<note><para>The &lisa; daemon requires root privileges to open the socket,
++but once the socket has been established root privileges are immediately
+ dropped.</para></note>
+ 
+ <para>You can also execute &lisa; using <command>nmblookup
+@@ -59,7 +59,7 @@
+ addresses are pingable.</para>
+ 
+ <note><para>&reslisa; will only provide the information over a &UNIX; domain
+-socket, ie: not over the network.  The name of the socket is
++socket, &ie; not over the network.  The name of the socket is
+ <filename>/tmp/resLISa-<replaceable>YourLoginName</replaceable></filename>,
+ so &reslisa; can be safely run on the same machine by more than one
+ user.</para></note>
+@@ -89,7 +89,7 @@
+ </programlisting>
+ 
+ <para>&lisa; can also be configured graphically in the
+-<menuchoice><guimenuitem>Control Center</guimenuitem><guisubmenu>Internet
++<menuchoice><guimenuitem>&kcontrolcenter;</guimenuitem><guisubmenu>Internet
+ &amp; Network</guisubmenu><guimenuitem>Local Network Browsing</guimenuitem>
+ </menuchoice> item in the &kmenu;.  However, to use this option &lisa; must
+ be started with the <option>-K</option> command line switch.</para>
+--- doc/userguide/base-kde-applications.docbook	(revision 488815)
++++ doc/userguide/base-kde-applications.docbook	(revision 494868)
+@@ -23,7 +23,7 @@
+ <variablelist>
+ <varlistentry>
+ <term>&konqueror;</term>
+-	<listitem><para>&kde;'s file manager, web browser, <acronym>FTP</acronym> client and much more. &konqueror; is the canvas for all the latest &kde; technology, from KIO slaves (which provide mechanisms for file access) to component embedding, allowing it to be a universal viewing application, capable of embedding image files to documents.</para>
++	<listitem><para>&kde;'s file manager, web browser, <acronym>FTP</acronym> client and much more. &konqueror; is the canvas for all the latest &kde; technology, from KIO slaves (which provide mechanisms for file access) to component embedding, allowing it to be a universal viewing application, capable of displaying various image files as well as documents.</para>
+ 	
+ 		<itemizedlist>
+ 			<listitem><para>Website: <ulink url="http://konqueror.org">http://konqueror.org</ulink></para></listitem>
+@@ -40,7 +40,7 @@
+ 		<itemizedlist>
+ 			<listitem><para>Website: <ulink url="http://kate.kde.org">http://kate.kde.org</ulink></para></listitem>
+ 			<listitem><para><ulink
+-	url="help:/kate">&kate; Handbook</ulink>.</para></listitem>
++	url="help:/kate">&kate; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+ 	</listitem>
+@@ -54,9 +54,9 @@
+ 	<listitem><para>The X terminal emulator for &kde;. &konsole;, like many &kde; applications, is extremely customizable; while you can create your own user sessions, you can also of course open &Linux; console sessions, shell sessions, as well as standard <systemitem class="username">root</systemitem> and sudo sessions.</para>
+ 	
+ 		<itemizedlist>
+-			<listitem><para>Website: <ulink url="http://konsole.kde.org">http://kate.kde.org</ulink></para></listitem>
++			<listitem><para>Website: <ulink url="http://konsole.kde.org">http://konsole.kde.org</ulink></para></listitem>
+ 			<listitem><para><ulink
+-	url="help:/kate">&konsole; Handbook</ulink></para></listitem>
++	url="help:/konsole">&konsole; Handbook</ulink></para></listitem>
+ 			<listitem><para>User Guide <xref linkend="konsole-intro" /></para></listitem>
+ 		</itemizedlist>
+ 		
+@@ -106,7 +106,7 @@
+ 
+ <varlistentry>
+ <term>&khelpcenter;</term>
+-	<listitem><para>The &kde; help system used to provide access to the base &UNIX; help pages (man or info) as well as the native &kde; documentation provided by the &kde; documentation team or the application authors. You should be able to access all of the &kde; application handbooks from here.</para>
++	<listitem><para>The &kde; help system is used to provide access to the base &UNIX; help pages (man or info) as well as the native &kde; documentation provided by the &kde; documentation team or the application authors. You should be able to access all of the &kde; application handbooks from here.</para>
+ 
+ 		<itemizedlist>
+ 			<listitem><para><ulink
+@@ -161,7 +161,7 @@
+ 	
+ 		<itemizedlist>
+ 			<listitem><para>Website: <ulink url="http://kmail.kde.org">http://kmail.kde.org</ulink></para></listitem>
+-			<listitem><para><ulink url="help:/kmail">&kmail; Handbook</ulink>.</para></listitem>
++			<listitem><para><ulink url="help:/kmail">&kmail; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+ 	</listitem>
+@@ -173,7 +173,7 @@
+ 	
+ 		<itemizedlist>
+ 			<listitem><para>Website: <ulink url="http://korganizer.kde.org">http://korganizer.kde.org</ulink></para></listitem>
+-			<listitem><para><ulink url="help:/korganizer">&korganizer; Handbook</ulink>.</para></listitem>
++			<listitem><para><ulink url="help:/korganizer">&korganizer; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+ 	</listitem>
+@@ -185,7 +185,7 @@
+ 	
+ 		<itemizedlist>
+ 			<listitem><para>Website: <ulink url="http://pim.kde.org/components/kaddressbook.php">http://pim.kde.org/components/kaddressbook.php</ulink></para></listitem>
+-			<listitem><para><ulink url="help:/kaddressbook">&kaddressbook; Handbook</ulink>.</para></listitem>
++			<listitem><para><ulink url="help:/kaddressbook">&kaddressbook; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+ 	</listitem>
+@@ -197,7 +197,7 @@
+ 	
+ 		<itemizedlist>
+ 			<listitem><para>Website: <ulink url="http://pim.kde.org/components/knotes.php">http://pim.kde.org/components/knotes.php</ulink></para></listitem>
+-			<listitem><para><ulink url="help:/knotes">&knotes; Handbook</ulink>.</para></listitem>
++			<listitem><para><ulink url="help:/knotes">&knotes; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+ 	</listitem>
+@@ -209,7 +209,7 @@
+ 	
+ 		<itemizedlist>
+ 			<listitem><para>Website: <ulink url="http://knode.sourceforge.net/">http://knode.sourceforge.net/</ulink></para></listitem>
+-			<listitem><para><ulink url="help:/knode">&knode; Handbook</ulink>.</para></listitem>
++			<listitem><para><ulink url="help:/knode">&knode; Handbook</ulink></para></listitem>
+ 		</itemizedlist>
+ 		
+ 	</listitem>
+@@ -286,7 +286,7 @@
+ 
+ <title>Office</title>
+ 
+-<para>This includes all applications in the &koffice; suit. See <xref linkend="kde-office-components" /> for a summary of the components.</para>
++<para>This includes all applications in the &koffice; suite. See <xref linkend="kde-office-components" /> for a summary of the components.</para>
+ 
+ </sect1>
+ 
+@@ -343,7 +343,7 @@
+ 
+ <varlistentry>
+ <term>&kolourpaint;</term>
+-	<listitem><para>A simple and easy-to-use paint program, with features such as basic painting (drawing diagrams and finger printing), image manipulation and icon editing. </para>
++	<listitem><para>A simple and easy-to-use paint program, with features such as basic painting (drawing diagrams and finger painting), image manipulation and icon editing. </para>
+ 	
+ 		<itemizedlist>
+ 			<listitem><para>Website: <ulink url="http://kolourpaint.sourceforge.net">http://kolourpaint.sourceforge.net</ulink></para></listitem>
+--- doc/userguide/usenet.docbook	(revision 488815)
++++ doc/userguide/usenet.docbook	(revision 494868)
+@@ -15,8 +15,11 @@
+ 
+ <title>Usenet News</title>
+ 
+-<!-- TODO: Write an intro to news in general and an abstract about -->
+-<!-- knode -->
++<para>Usenet newsgroups are forums in which you can post messages to discuss
++various topics: almost any subject you like (and many you don't!) can
++be found there. Although usenet has become less popular than it once
++was, because of the increasing use of web forums, &etc;, it is still a
++useful tool. &kde; provides a powerful usenet news reader called &knode;.</para>
+ 
+ <para>You can find &knode; in the <guimenu>K</guimenu> Menu under the
+ <guisubmenu>Internet</guisubmenu> entry: the menu entry
+@@ -96,13 +99,12 @@
+ 
+ 
+ <para>Now we must tell &knode; about where we get the news from or
+-where to send the articles to later on. In the tree view on the
+-right, there is an <guilabel>Accounts</guilabel> entry; click on it
+-with the mouse; then, two sub entries will be opened out. Choose the
+-<guilabel>News</guilabel> entry, because we first want to configure
++where to send the articles to later on. In the list on the
++right, there is an <guilabel>Accounts</guilabel> entry; click on it and choose the
++<guilabel>Newsgroup servers</guilabel> tab, because we first want to configure
+ the news account: the list of accounts is still empty.</para>
+ 
+-<para>To create a new account click on <guibutton>New...</guibutton>. The
++<para>To create a new account click on <guibutton>Add...</guibutton>. The
+ following dialog appears:</para>
+ 
+ <screenshot>
+@@ -169,7 +171,7 @@
+ <para>Sometimes you need to answer to the author of an article
+ directly, without posting to the newsgroup; for example, when you want
+ to make a very personal comment or want to correct an error. If you
+-want to do this, select <guilabel>Mail</guilabel> in the tree view. The
++want to do this, select the <guilabel>Mail Server (SMTP)</guilabel> tab. The
+ following dialog box appears:</para> 
+ 
+ <screenshot> 
+@@ -186,10 +188,6 @@
+ </mediaobject> 
+ </screenshot> 
+ 
+-<para>You will notice this dialog box is very similar to the news
+-account settings dialog box.</para>
+-
+-
+ <variablelist>
+ 
+ <varlistentry>
+@@ -201,7 +199,7 @@
+ <guilabel>Server</guilabel> field.</para>
+ 
+ <para>In our example we enter <userinput><systemitem
+-class="systemname">mail.server.de</systemitem></userinput></para>
++class="systemname">mail.server.com</systemitem></userinput></para>
+ </listitem>
+ </varlistentry>
+ 
+@@ -219,8 +217,14 @@
+ <!-- Add links to "further reading" here -->
+ <itemizedlist>
+ <title>Related Information</title>
+-<listitem><para></para>
++<listitem><para>The comp.windows.x.kde newsgroup is the main user
++support group for &kde; on usenet. You can find other resources for
++getting help with &kde; in <xref linkend="getting-help"/>.</para>
+ </listitem>
++<listitem><para><ulink url="http://gmane.org">Gmane</ulink> provides a
++usenet frontend to many mailing lists, including most of the &kde;
++lists, so you can read them with &knode;.</para>
++</listitem>
+ </itemizedlist>
+ 
+ 
+--- doc/userguide/programs-and-documents.docbook	(revision 488815)
++++ doc/userguide/programs-and-documents.docbook	(revision 494868)
+@@ -41,7 +41,7 @@
+ <para>Launchers to programs may also be placed on the desktop. To create a
+ new launcher, <mousebutton>right</mousebutton> click on the desktop, and
+ choose <menuchoice><guimenu>Create
+-New</guimenu><guisubmenu>File</guisubmenu><guimenuitem>Link to
++New</guimenu><guimenuitem>Link to
+ Application</guimenuitem></menuchoice>. On the &kdesktop; properties dialog
+ box, type in the name of the program on the <guilabel>General</guilabel>
+ tab. You may also wish to choose a custom icon by clicking on the gear icon.
+@@ -50,24 +50,24 @@
+ <guilabel>Command</guilabel> textbox, type the name of the program (case
+ sensitive), and any command line options you wish to use. Choose
+ <guibutton>OK</guibutton>, and your new program launcher will be created on
+-your desktop. Just double click the new launcher on the desktop and the
+-associated program will run.</para>
++your desktop.  Simply click on the new launcher on the desktop and the
++ associated program will run.</para>
+ 
+ <para>To launch a program using &konsole;, click the &kmenu; and choose
+ <menuchoice><guisubmenu>System</guisubmenu><guisubmenu>Terminals
+ </guisubmenu><guimenuitem>Konsole</guimenuitem></menuchoice>. Once &konsole;
+ appears on the screen, simply type the name of the program you wish to
+-launch (remembering &konsole; is case sensitive) and press
++launch ((remembering that <application>bash</application>, the command language interpreter that &konsole; uses, is case-sensitive) and press
+ <keycap>Enter</keycap>. If you are unsure about the name of a program, type
+ the first few letters then press the &Tab; key on your keyboard. By pressing
+-&Tab;, &konsole; will try to guess the name of the program you wish to
+-launch. If &konsole; finds more then one matching program, a list of
+-matching programs will be printed on the screen. Type the name of the
+-program from the list and press <keycap>Enter</keycap> to launch.</para>
++&Tab;, <application>bash</application> (through &konsole;) will try to guess the name of the program you wish to
++launch. If it finds more then one matching program, a list of
++ matching programs will be printed on the screen. Type the name of the
++ program from the list and press <keycap>Enter</keycap> to launch.</para>
+ 
+ <para>Whichever way you choose, launching a program is a simple affair with
+ &kde;. From the &kmenu;, to &konsole;, all your programs are just a few
+-clicks or key presses away.</para>
++clicks or key-presses away.</para>
+ 
+ <!-- Add links to "further reading" here -->
+ <itemizedlist>
+--- doc/kwrite/index.docbook	(revision 488815)
++++ doc/kwrite/index.docbook	(revision 494868)
+@@ -1,19 +1,20 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" 
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
+ "dtd/kdex.dtd" [
+-  <!ENTITY kappname "&kwrite;">  
++  <!ENTITY kappname "&kwrite;">
+   <!ENTITY package "kdebase">
+-  <!ENTITY % addindex "IGNORE"> 
+-  <!ENTITY % English "INCLUDE" > <!-- change language only here -->   
+-]>  
+-  
+-<book lang="&language;">  
++  <!ENTITY % addindex "IGNORE">
++  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
++]>
+ 
+-<bookinfo>  
+-<title>The &kwrite; Handbook</title>  
+-<authorgroup>  
++<book lang="&language;">
++
++<bookinfo>
++<title>The &kwrite; Handbook</title>
++<authorgroup>
+ <author>&Thad.McGinnis; &Thad.McGinnis.mail;</author>
+-
++<author>&Anne-Marie.Mahfouf; &Anne-Marie.Mahfouf.mail;</author>
++<author>&Anders.Lund; &Anders.Lund.mail;</author>
+ <othercredit role="developer">
+ &Christoph.Cullmann; &Christoph.Cullmann.mail;
+ <!-- <contrib>Core Developer and Maintainer</contrib> -->
+@@ -32,10 +33,15 @@
+ <year>2000</year><year>2001</year>
+ <holder>&Thad.McGinnis;</holder>
+ </copyright>
++<copyright>
++<year>2005</year>
++<holder>&Anne-Marie.Mahfouf; &Anne-Marie.Mahfouf.mail;</holder>
++<holder>&Anders.Lund; &Anders.Lund.mail;</holder>
++</copyright>
+ <legalnotice>&FDLNotice;</legalnotice>
+ 
+-<date>2004-08-27</date>
+-<releaseinfo>2.00.00</releaseinfo>
++<date>2005-12-27</date>
++<releaseinfo>4.5.0</releaseinfo>
+ 
+ <abstract>
+ <para>&kwrite; is a text editor for &kde;</para>
+@@ -61,49 +67,50 @@
+ languages. &kwrite; also works very well as a simple text editor.  One
+ of &kwrite;'s main features is the colorized syntax, customized for many
+ different programming languages such as: C/C++, &Java;, Python, Perl,
+-Bash, Modula 2, <acronym>HTML</acronym>, and Ada.
++Bash, Modula 2, &HTML;, and Ada.
+ </para>
+ 
+ </chapter>
+ 
+-<chapter id="on-screen-fundamentals">  
+-<title>Some Fundamentals</title>  
+-  
++<chapter id="on-screen-fundamentals">
++<title>Some Fundamentals</title>
++
+ <para>
+ &kwrite; is very simple to use. Anyone that has used a text editor
+ should have no problems.
+ </para>
+-  
+-<sect1 id="drag-and-drop">  
+-<title>Drag and Drop</title>  
+-  
++
++<sect1 id="drag-and-drop">
++<title>Drag and Drop</title>
++
+ <para>
+ &kwrite; uses the &kde; Drag and Drop protocol. Files may be dragged and
+ dropped onto &kwrite; from the Desktop, &konqueror; or some remote &FTP;
+ site opened in one of &konqueror;'s windows.
+ </para>
+ </sect1>
+-  
+-<sect1 id="command-line-options">  
+-<title>Command Line Options</title>  
+-  
++
++<sect1 id="command-line-options">
++<title>Command Line Options</title>
++
+ <para>
+-Though &kwrite; may most often be started from the KDE program menu, or
++Though &kwrite; may most often be started from the &kde; program menu, or
+ a desktop icon, it can also be opened at the command line prompt of a
+ terminal window.  There are a few useful options that are available when
+-doing this.  
++doing this.
+ </para>
+-  
+-<sect2 id="specify-a-file">  
+-<title>Specify a File</title>  
+-  
+-<para>By specifying the path and name of a particular file the user can  
++
++<sect2 id="specify-a-file">
++<title>Specify a File</title>
++
++<para>By specifying the path and name of a particular file the user can
+ have &kwrite; open (or create) that file immediately upon startup.  This
+ option might look something like the following:</para>
+ 
+ <informalexample><screen>
+-<prompt>%</prompt> <userinput><command>kwrite</command> 
+-<option><replaceable>/home/myhome/docs/myfile.txt</replaceable></option></userinput>
++<prompt>%</prompt> <userinput><command>kwrite</command>
++<option><replaceable>/home/myhome/docs/myfile.txt</replaceable></option>
++</userinput>
+ </screen>
+ </informalexample>
+ </sect2>
+@@ -115,8 +122,9 @@
+ this might look like the following:</para>
+ 
+ <informalexample><screen>
+-<prompt>%</prompt> <userinput><command>kwrite</command> 
+-<option><replaceable>ftp://ftp.kde.org/pub/kde/Welcome.msg</replaceable></option></userinput>
++<prompt>%</prompt> <userinput><command>kwrite</command>
++<option><replaceable>ftp://ftp.kde.org/pub/kde/Welcome.msg</replaceable>
++</option></userinput>
+ </screen>
+ </informalexample>
+ 
+@@ -128,245 +136,406 @@
+ <para>The following command line help options are available</para>
+ 
+ <variablelist>
+-<varlistentry>  
+-<term><userinput><command>kwrite</command> 
+-<option>--help</option></userinput></term>  
+-<listitem><para>This lists the most basic options available at the command  
+-line.</para></listitem>  
+-</varlistentry>  
+-<varlistentry>  
+-<term><userinput><command>kwrite</command> 
++<varlistentry>
++<term><userinput><command>kwrite</command>
++<option>--help</option></userinput></term>
++<listitem><para>This lists the most basic options available at the command
++line.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><userinput><command>kwrite</command>
+ <option>--help-qt</option></userinput></term>
+-<listitem><para>This lists the options available for changing the way  
+-&kwrite; interacts with &Qt;.</para></listitem>  
+-</varlistentry>  
+-<varlistentry>  
+-<term><userinput><command>kwrite</command> 
++<listitem><para>This lists the options available for changing the way
++&kwrite; interacts with &Qt;.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><userinput><command>kwrite</command>
+ <option>--help-kde</option></userinput></term>
+-<listitem><para>This lists the options available for changing the way  
+-&kwrite; interacts with &kde;.</para></listitem>  
+-</varlistentry>  
+-<varlistentry>  
+-<term><userinput><command>kwrite</command> 
++<listitem><para>This lists the options available for changing the way
++&kwrite; interacts with &kde;.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><userinput><command>kwrite</command>
+ <option>--help-all</option></userinput></term>
+-<listitem><para>This lists all of the command line options.</para></listitem>  
+-</varlistentry>  
+-<varlistentry>  
+-<term><userinput><command>kwrite</command> 
++<listitem><para>This lists all of the command line options.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><userinput><command>kwrite</command>
+ <option>--author</option></userinput></term>
+-<listitem><para>Lists &kwrite;'s authors in the terminal 
+-window</para></listitem>  
+-</varlistentry>  
+-<varlistentry>  
+-<term><userinput><command>kwrite</command> 
++<listitem><para>Lists &kwrite;'s authors in the terminal
++window</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><userinput><command>kwrite</command>
+ <option>--version</option></userinput></term>
+-<listitem><para>Lists version information for &Qt;, &kde;, and &kwrite;. Also 
+-available through <userinput><command>kwrite</command> 
+-<option>-V</option></userinput> </para></listitem>
+-</varlistentry>  
+-</variablelist>  
++<listitem><para>Lists version information for &Qt;, &kde;, and &kwrite;. Also
++available through <userinput><command>kwrite</command>
++<option>-v</option></userinput> </para></listitem>
++</varlistentry>
++<varlistentry>
++<term><userinput><command>kwrite</command>
++<option>--stdin</option></userinput></term>
++<listitem><para>Causes &kwrite; to read the document content from STDIN. This
++is similar to the common option <option>-</option> used in many command line
++programs, and allows you to pipe command output into &kwrite;.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><userinput><command>kwrite</command>
++<option>--encoding</option> <parameter>encoding</parameter>
++<parameter>&URL;</parameter></userinput></term>
++<listitem><para>Causes &kwrite; to use the specified encoding for the document.
++</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><userinput><command>kwrite</command>
++<option>--line</option> <parameter>line</parameter>
++<parameter>&URL;</parameter></userinput></term>
++<listitem><para>Navigate to the specified line after opening the document.
++</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><userinput><command>kwrite</command>
++<option>--column</option> <parameter>column</parameter>
++<parameter>&URL;</parameter></userinput></term>
++<listitem><para>Navigate to the specified column after opening the document.
++</para></listitem>
++</varlistentry>
++
++</variablelist>
+ </sect2>
+-</sect1>  
+-  
+-<sect1 id="keybindings">  
+-<title>Key Bindings</title>  
+-  
+-<para>Many of the key bindings (shortcuts) are configurable by way of the <link  
++</sect1>
+ 
++<sect1 id="keybindings">
++<title>Shortcuts</title>
+ 
+-linkend="settings">Settings</link> menu.  By default &kwrite; honors the  
+-following key bindings.</para>  
+-  
+-<informaltable>  
+-<tgroup cols="2">  
+-<tbody>  
+-  
+-<row><entry><para><keycombo 
+-action="simul"><keycap>Insert</keycap></keycombo></para></entry>  
++<para>Many of the shortcuts are configurable by way of the <link
++ linkend="settings">Settings</link> menu.  By default &kwrite; honors the
++following shortcuts:</para>
++<informaltable>
++<tgroup cols="2">
++<tbody>
++
++<row><entry><para><keycombo
++action="simul"><keycap>Insert</keycap></keycombo></para></entry>
+ <entry><para> Toggle between Insert and Overwrite mode. When in insert mode the
+ editor will add any typed characters to the text while pushing along any data to
+ the right of the text cursor. Overwrite mode causes the entry of each character
+ to eliminate the character immediately to the right of the text
+ cursor.</para></entry>
+-</row>  
+-<row>  
+-<entry><para><keycombo action="simul"><keycap>Left 
+-Arrow</keycap></keycombo></para></entry>  
+-<entry><para>Move the cursor one character to the left </para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo action="simul"><keycap>Right 
+-Arrow</keycap></keycombo></para></entry>  
+-<entry><para> Move the cursor one character to the right </para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo action="simul"><keycap>Up 
+-Arrow</keycap></keycombo></para></entry>  
+-<entry><para> Move the cursor up one line  </para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo action="simul"><keycap>Down 
+-Arrow</keycap></keycombo></para></entry>  
+-<entry><para> Move the cursor down one line </para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo action="simul"><keycap>Page 
+-Up</keycap></keycombo></para></entry>  
+-<entry><para> Move the cursor up one page  </para></entry>  
+ </row>
+-<row>  
+-<entry><para><keycombo action="simul"><keycap>Page 
+-Down</keycap></keycombo></para></entry>  
+-<entry><para>Move the cursor down one page  </para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo 
+-action="simul"><keycap>Backspace</keycap></keycombo></para></entry>  
+-<entry><para> Delete the character to the left of the cursor </para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo 
+-action="simul"><keycap>Home</keycap></keycombo></para></entry>  
+-<entry><para> Move the cursor to the beginning of the line </para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo 
+-action="simul"><keycap>End</keycap></keycombo></para></entry>  
+-<entry><para> Move the cursor to the end of the line </para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo 
+-action="simul"><keycap>Delete</keycap></keycombo></para></entry>  
+-<entry><para>Delete the character to the right of the cursor (or any selected  
+-text)</para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo action="simul">&Shift;<keycap>Left 
+-Arrow</keycap></keycombo></para></entry>  
+-<entry><para> Mark text one character to the left </para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo action="simul">&Shift;<keycap>Right 
+-Arrow</keycap></keycombo></para></entry>  
+-<entry><para> Mark text one character to the right </para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo 
+-action="simul"><keycap>F1</keycap></keycombo></para></entry>  
+-<entry><para> Help</para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo 
++<row>
++<entry><para><keycombo action="simul"><keycap>Left
++Arrow</keycap></keycombo></para></entry>
++<entry><para>Move the cursor one character to the left </para></entry>
++</row>
++<row>
++<entry><para><keycombo action="simul"><keycap>Right
++Arrow</keycap></keycombo></para></entry>
++<entry><para> Move the cursor one character to the right </para></entry>
++</row>
++<row>
++<entry><para><keycombo action="simul"><keycap>Up
++Arrow</keycap></keycombo></para></entry>
++<entry><para> Move the cursor up one line  </para></entry>
++</row>
++<row>
++<entry><para><keycombo action="simul"><keycap>Down
++Arrow</keycap></keycombo></para></entry>
++<entry><para> Move the cursor down one line </para></entry>
++</row>
++<row>
++<entry><para><keycombo action="simul"><keycap>Page
++Up</keycap></keycombo></para></entry>
++<entry><para> Move the cursor up one page  </para></entry>
++</row>
++<row>
++<entry><para><keycombo action="simul">&Alt;<keycap>Page
++Up</keycap></keycombo></para></entry>
++<entry><para>Previous Bookmark  </para></entry>
++</row>
++<row>
++<entry><para><keycombo action="simul"><keycap>Page
++Down</keycap></keycombo></para></entry>
++<entry><para>Move the cursor down one page  </para></entry>
++</row>
++<row>
++<entry><para><keycombo action="simul">&Alt;<keycap>Page
++Down</keycap></keycombo></para></entry>
++<entry><para>Next Bookmark  </para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul"><keycap>Backspace</keycap></keycombo></para></entry>
++<entry><para> Delete the character to the left of the cursor </para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul"><keycap>Home</keycap></keycombo></para></entry>
++<entry><para> Move the cursor to the beginning of the line </para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul"><keycap>End</keycap></keycombo></para></entry>
++<entry><para> Move the cursor to the end of the line </para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul"><keycap>Delete</keycap></keycombo></para></entry>
++<entry><para>Delete the character to the right of the cursor (or any selected
++text)</para></entry>
++</row>
++<row>
++<entry><para><keycombo action="simul">&Shift;<keycap>Left
++Arrow</keycap></keycombo></para></entry>
++<entry><para> Mark text one character to the left </para></entry>
++</row>
++<row>
++<entry><para><keycombo action="simul">&Shift;<keycap>Right
++Arrow</keycap></keycombo></para></entry>
++<entry><para> Mark text one character to the right </para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul"><keycap>F1</keycap></keycombo></para></entry>
++<entry><para> Help</para></entry>
++</row>
++<row>
++<entry><para><keycombo
+ action="simul">&Shift;<keycap>F1</keycap></keycombo></para></entry>
+-<entry><para>What's this?</para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo 
+-action="simul">&Ctrl;<keycap>F</keycap></keycombo></para></entry>  
+-<entry><para><link linkend="find"> Find</link></para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo 
+-action="simul"><keycap>F3</keycap></keycombo></para></entry>  
+-<entry><para><link linkend="find-again"> Find again</link></para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo 
+-action="simul">&Ctrl;<keycap>C</keycap></keycombo></para></entry>  
+-<entry><para> Copy the marked text to the clipboard. </para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo 
+-action="simul">&Ctrl;<keycap>B</keycap></keycombo></para></entry>  
+-<entry><para>Set a Bookmark</para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo 
+-action="simul">&Ctrl;<keycap>N</keycap></keycombo></para></entry>  
+-<entry><para> <link linkend="new">New</link> document</para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo 
+-action="simul">&Ctrl;<keycap>P</keycap></keycombo></para></entry>  
+-<entry><para><link linkend="print">Print</link> </para></entry>  
+-</row>  
++<entry><para>What's this?</para></entry>
++</row>
+ <row>
+-<entry><para><keycombo 
++<entry><para><keycombo
++action="simul"><keycap>F3</keycap></keycombo></para></entry>
++<entry><para><link linkend="find-again"> Find again</link></para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Shift;<keycap>F3</keycap></keycombo></para></entry>
++<entry><para><link linkend="find-previous"> Find Previous</link></para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>A</keycap></keycombo></para></entry>
++<entry><para>Select All</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;&Shift;<keycap>A</keycap></keycombo></para></entry>
++<entry><para>Deselect</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;&Shift;<keycap>B</keycap></keycombo></para></entry>
++<entry><para>Block Selection Mode</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>B</keycap></keycombo></para></entry>
++<entry><para>Set a Bookmark</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>C</keycap></keycombo></para></entry>
++<entry><para> Copy the marked text to the clipboard. </para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>D</keycap></keycombo></para></entry>
++<entry><para> Comment</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;&Shift;<keycap>D</keycap></keycombo></para></entry>
++<entry><para> Uncomment</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>F</keycap></keycombo></para></entry>
++<entry><para><link linkend="find"> Find</link></para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>G</keycap></keycombo></para></entry>
++<entry><para> Go to line...</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>I</keycap></keycombo></para></entry>
++<entry><para> Indent selection</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;&Shift;<keycap>I</keycap></keycombo></para></entry>
++<entry><para> Unindent selection</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>J</keycap></keycombo></para></entry>
++<entry><para>Join Lines</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>N</keycap></keycombo></para></entry>
++<entry><para> <link linkend="new">New</link> document</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>O</keycap></keycombo></para></entry>
++<entry><para><link linkend="open">Open a document</link> </para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>P</keycap></keycombo></para></entry>
++<entry><para><link linkend="print">Print</link> </para></entry>
++</row>
++<row>
++<entry><para><keycombo
+ action="simul">&Ctrl;<keycap>Q</keycap></keycombo></para></entry>
+ <entry><para>Quit - close active copy of editor </para></entry>
+ </row>
+ <row>
+-<entry><para><keycombo 
++<entry><para><keycombo
+ action="simul">&Ctrl;<keycap>R</keycap></keycombo></para></entry>
+ <entry><para><link linkend="replace"> Replace</link></para></entry>
+ </row>
+ <row>
+-<entry><para><keycombo 
++<entry><para><keycombo
+ action="simul">&Ctrl;<keycap>S</keycap></keycombo></para></entry>
+ <entry><para>Invokes the <link
+ linkend="save"><guilabel>Save</guilabel></link> command.</para></entry>
+ </row>
+ <row>
+-<entry><para><keycombo 
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>U</keycap></keycombo></para></entry>
++<entry><para>Uppercase</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;&Shift;<keycap>U</keycap></keycombo></para></entry>
++<entry><para>Lowercase</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Alt;&Ctrl;<keycap>U</keycap></keycombo></para></entry>
++<entry><para>Capitalize</para></entry>
++</row>
++<row>
++<entry><para><keycombo
+ action="simul">&Ctrl;<keycap>V</keycap></keycombo></para></entry>
+-<entry><para> Paste the clipboard text into line edit. </para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo 
+-action="simul">&Ctrl;<keycap>X</keycap></keycombo></para></entry>  
+-<entry><para>Delete the marked text and copy it to the clipboard. 
++<entry><para> Paste the clipboard text into line edit. </para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>W</keycap></keycombo></para></entry>
++<entry><para><link linkend="close">Close</link> </para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>X</keycap></keycombo></para></entry>
++<entry><para>Delete the marked text and copy it to the clipboard.
+ </para></entry>
+-</row>  
+-<row>  
+-<entry><para><keycombo 
+-action="simul">&Ctrl;<keycap>Z</keycap></keycombo></para></entry>  
+-<entry><para><link linkend="undo">Undo</link></para></entry>  
+-</row>  
+-<row>  
+-<entry><para><keycombo 
+-action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></para></entry>  
+-<entry><para><link linkend="redo">Redo</link></para></entry>  
+-</row>  
+-</tbody>  
+-</tgroup>  
+-</informaltable>  
+-</sect1>  
+-</chapter>  
+-  
+-<chapter id="the-menu-entries">  
+-<title>The Menu Entries</title>  
+-  
+-<sect1 id="file">  
+-<title>The <guimenu>File</guimenu> Menu</title>  
+-  
+-<variablelist>  
+-  
+-<varlistentry>  
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>Z</keycap></keycombo></para></entry>
++<entry><para><link linkend="undo">Undo</link></para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></para></entry>
++<entry><para><link linkend="redo">Redo</link></para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>-</keycap></keycombo></para></entry>
++<entry><para>Collapse One Local Level</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;&Shift;<keycap>-</keycap></keycombo></para></entry>
++<entry><para>Collapse Toplevel</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;<keycap>+</keycap></keycombo></para></entry>
++<entry><para>Expand One Local Level</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul">&Ctrl;&Shift;<keycap>+</keycap></keycombo></para></entry>
++<entry><para>Expand Toplevel</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul"><keycap>F5</keycap></keycombo></para></entry>
++<entry><para><link linkend="reload"> Reload</link></para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul"><keycap>F6</keycap></keycombo></para></entry>
++<entry><para>Show/Hide Icon Border</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul"><keycap>F7</keycap></keycombo></para></entry>
++<entry><para> Switch to Command Line</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul"><keycap>F9</keycap></keycombo></para></entry>
++<entry><para> Show/Hide Folding Markers</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul"><keycap>F10</keycap></keycombo></para></entry>
++<entry><para> Dynamic Word Wrap</para></entry>
++</row>
++<row>
++<entry><para><keycombo
++action="simul"><keycap>F11</keycap></keycombo></para></entry>
++<entry><para> Show/Hide Line Numbers</para></entry>
++</row>
++</tbody>
++</tgroup>
++</informaltable>
++</sect1>
++</chapter>
++
++<chapter id="the-menu-entries">
++<title>The Menu Entries</title>
++
++<sect1 id="file">
++<title>The <guimenu>File</guimenu> Menu</title>
++
++<variablelist>
++
++<varlistentry>
+ <term id="new">
+-<menuchoice>  
++<menuchoice>
+ <shortcut>
+ <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo>
+-</shortcut>  
++</shortcut>
+ <guimenu>File</guimenu>
+-<guimenuitem>New</guimenuitem></menuchoice></term>  
++<guimenuitem>New</guimenuitem></menuchoice></term>
+ <listitem>
+ <para>
+-This starts a new Document in the editor. If there is a current  
++This starts a new Document in the editor. If there is a current
+ document with unsaved changes the user is given a chance to save it.
+-</para>  
+-</listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
+ <term id="open">
+-<menuchoice>  
++<menuchoice>
+ <shortcut>
+ <keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo>
+-</shortcut>  
++</shortcut>
+ <guimenu>File</guimenu>
+ <guimenuitem>Open...</guimenuitem>
+ </menuchoice>
+-</term>  
++</term>
+ 
+ <listitem>
+ <!--
+@@ -381,9 +550,9 @@
+ window directs the dialog to enter that folder - displaying its
+ contents.  There is an entry/dropdown box which can be used to type in
+ directly the location and name of the file or by clicking the arrow at
+-the side choose from a dropdown list of recently used locations. Below
++the side choose from a drop down box of recently used locations. Below
+ this is a filter which similarly may have data entered directly or
+-chosen from a dropdown list of recent filter types.  The filter facility
++chosen from a drop down box of recent filter types.  The filter facility
+ lets only files that meet its specifications be displayed in the central
+ window. If the filter contained text such as <literal
+ role="extension">*.txt</literal> then only files with the <literal
+@@ -401,7 +570,7 @@
+ to his or her home folder and the one with the two arrows curved in
+ on each other updates the view of the current folder. The flag button
+ lets the user set a new bookmark at the current folder or go to one
+-that was previously set. 
++that was previously set.
+ </para>
+ 
+ <para>
+@@ -417,36 +586,36 @@
+ the &kde; User Guide.</para>
+ 
+ </listitem>
+-</varlistentry>  
+-  
+-<varlistentry>  
++</varlistentry>
++
++<varlistentry>
+ <term id="open-recent">
+-<menuchoice>  
++<menuchoice>
+ <guimenu>File</guimenu>
+ <guisubmenu>Open Recent</guisubmenu>
+ </menuchoice>
+-</term> 
++</term>
+ <listitem>
+ <para>
+ This is a shortcut to open recently saved documents. Clicking on this
+ item opens a list to the side of the menu with several of the most
+ recently saved files. Clicking on a specific file will open it in
+ &kwrite; - if the file still resides at the same
+-location. 
++location.
+ </para>
+ </listitem>
+ </varlistentry>
+-  
+-<varlistentry>  
++
++<varlistentry>
+ <term id="save">
+-<menuchoice>  
++<menuchoice>
+ <shortcut>
+ <keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>
+-</shortcut>  
++</shortcut>
+ <guimenu>File</guimenu>
+ <guimenuitem>Save</guimenuitem>
+ </menuchoice>
+-</term>  
++</term>
+ <listitem>
+ <para>
+ This saves the current document.  If there has already been a save of
+@@ -454,67 +623,99 @@
+ asking for the user's consent.  If it is the first save of a new
+ document the save as dialog (described below) will be invoked.
+ </para>
+-</listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
++</listitem>
++</varlistentry>
++
++<varlistentry>
+ <term id="save-as">
+ <menuchoice>
+ <guimenu>File</guimenu>
+ <guimenuitem>Save As...</guimenuitem>
+ </menuchoice>
+-</term>  
++</term>
+ <listitem>
+ <para>
+ This allows a document to be saved with a new file name. This is done by
+ means of the file dialog box described above in the <link
+-linkend="open">Open</link> section of this help file.  
++linkend="open">Open</link> section of this help file.
+ </para>
+ </listitem>
+ </varlistentry>
+-  
+-<varlistentry>  
++
++<varlistentry>
++<term id="reload">
++<menuchoice>
++<shortcut>
++<keycombo action="simul"><keycap>F5</keycap></keycombo>
++</shortcut>
++<guimenu>File</guimenu>
++<guimenuitem>Reload</guimenuitem>
++</menuchoice>
++</term>
++<listitem>
++<para>
++Reloads the active file from disk. This command is useful if another program or
++process has changed the file while you have it open in &kwrite;.
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
+ <term id="print">
+-<menuchoice>  
++<menuchoice>
+ <shortcut>
+ <keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo>
+-</shortcut>  
++</shortcut>
+ <guimenu>File</guimenu>
+ <guimenuitem>Print...</guimenuitem>
+ </menuchoice>
+-</term>  
+-<listitem>  
++</term>
++<listitem>
+ <para>
+ Opens a simple print dialog allowing the user to specify what, where,
+-and how to print
+-</para>  
+-</listitem>  
+-</varlistentry>  
+-  
+-<!--
+-<varlistentry>  
+-<term id="new-view">
+-<menuchoice>  
++and how to print.
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term id="export-as-html">
++<menuchoice>
+ <guimenu>File</guimenu>
+-<guimenuitem>New View</guimenuitem>
++<guimenuitem>Export as HTML...</guimenuitem>
+ </menuchoice>
+-</term>  
+-<listitem>  
++</term>
++<listitem>
+ <para>
+-This creates a new view of the current document, &ie;, a new instance of
+-&kwrite; (as explained in the previous entry) but containing the same
+-document.
++Export your file in HTML format so your document can be viewed as a web page.
+ </para>
+-</listitem>  
+-</varlistentry>  
+-  //-->
++</listitem>
++</varlistentry>
+ 
+-<varlistentry>  
++<varlistentry>
+ <term id="close">
+ <menuchoice>
+ <shortcut>
++<keycombo action="simul">&Ctrl;<keycap>W</keycap></keycombo>
++</shortcut>
++<guimenu>File</guimenu>
++<guimenuitem>Close</guimenuitem>
++</menuchoice>
++</term>
++<listitem>
++<para>
++Close the active file with this command. If you have made unsaved changes, you
++will be prompted to save the file before &kwrite; closes it.
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term id="quit">
++<menuchoice>
++<shortcut>
+ <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>
+-</shortcut>  
++</shortcut>
+ <guimenu>File</guimenu>
+ <guimenuitem>Quit</guimenuitem>
+ </menuchoice>
+@@ -527,23 +728,23 @@
+ not be closed.
+ </para>
+ </listitem>
+-</varlistentry>  
+-  
+-</variablelist>  
+-  
+-</sect1>  
+-  
+-<sect1 id="edit">  
+-<title>The <guimenu>Edit</guimenu> Menu</title>  
+-  
+-<variablelist>  
++</varlistentry>
++
++</variablelist>
++
++</sect1>
++
++<sect1 id="edit">
++<title>The <guimenu>Edit</guimenu> Menu</title>
++
++<variablelist>
+ <varlistentry>
+-<term id="undo"><menuchoice>  
+-<shortcut><keycombo 
+-action="simul">&Ctrl;<keycap>Z</keycap></keycombo></shortcut>  
++<term id="undo"><menuchoice>
++<shortcut><keycombo
++action="simul">&Ctrl;<keycap>Z</keycap></keycombo></shortcut>
+ <guimenu>Edit</guimenu>
+ <guimenuitem>Undo</guimenuitem></menuchoice></term>
+-<listitem>  
++<listitem>
+ <para>This is used to eliminate or reverse the most recent user action
+ or operation.
+ <!--
+@@ -551,126 +752,198 @@
+ understood by referring to the <link linkend="group-undos">Group
+ Undos</link> portion of this help file.
+ -->
+-</para>   
+-</listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
+-<term><anchor id="redo"/><menuchoice>  
+-<shortcut><keycombo 
+-action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></shortcut>  
+-<guimenu>Edit</guimenu><guimenuitem>Redo</guimenuitem></menuchoice></term>  
+-<listitem>  
+-<para>This will reverse the most recent change (if any) made using Undo</para>  
+-</listitem>  
+-</varlistentry>  
+-  
+-<!--<varlistentry>  
+-<term><anchor id="undohistory"/><menuchoice>  
+-<guimenu>Edit</guimenu><guimenuitem>Undo/Redo 
+-History</guimenuitem></menuchoice></term>  
+-<listitem>  
+-<para>This will call a display box showing a list of the most recent actions on  
++</para>
++</listitem>
++</varlistentry>
+ 
++<varlistentry>
++<term><anchor id="redo"/><menuchoice>
++<shortcut><keycombo
++action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></shortcut>
++<guimenu>Edit</guimenu><guimenuitem>Redo</guimenuitem></menuchoice></term>
++<listitem>
++<para>This will reverse the most recent change (if any) made using Undo</para>
++</listitem>
++</varlistentry>
+ 
+-the left and another list of actions which have been 'undone' on the right.  
+-There are also three buttons at the right of the box labeled  
+-<guibutton>Undo</guibutton>, <guibutton>Redo</guibutton>, and  
+-<guibutton>Close</guibutton>.  Clicking on the <guibutton>Undo</guibutton>  
+-button will cause the action at the top of the Undo list to be reversed which  
+-will place that particular action at the top of the Redo list. Likewise,  
+-clicking on the <guibutton>Redo</guibutton> button will reinstate the reversed  
+-action and move it back to the top of the Undo list.  Clicking on an item below  
++<varlistentry>
++<term><anchor id="cut"/><menuchoice>
++<shortcut><keycombo
++action="simul">&Ctrl;<keycap>X</keycap></keycombo></shortcut>
++<guimenu>Edit</guimenu><guimenuitem>Cut</guimenuitem></menuchoice></term>
++<listitem>
++<para>This command deletes the current selection and places it on the
++clipboard.
++The  clipboard is a feature of &kde; that works invisibly to provide a way to
++transfer data between applications.</para>
++</listitem>
++</varlistentry>
+ 
++<varlistentry>
++<term><anchor id="copy"/><menuchoice>
++<shortcut><keycombo
++action="simul">&Ctrl;<keycap>C</keycap></keycombo></shortcut>
++<guimenu>Edit</guimenu><guimenuitem>Copy</guimenuitem></menuchoice></term>
++<listitem>
++<para>This copies the currently selected text to the clipboard so that it may
++be pasted elsewhere.  The clipboard is a feature of &kde; that works invisibly
++to provide a way to transfer data between applications.</para>
++</listitem>
++</varlistentry>
+ 
+-the top item in either list will select all the items from the top down to that  
++<varlistentry>
++<term><anchor id="copy-as-html"/><menuchoice>
++<guimenu>Edit</guimenu><guimenuitem>Copy as
++HTML</guimenuitem></menuchoice></term>
++<listitem>
++<para>This copies the currently selected text to the clipboard as HTML.</para>
++ </listitem>
++</varlistentry>
+ 
++<varlistentry>
++<term><anchor id="paste"/><menuchoice>
++<shortcut><keycombo
++action="simul">&Ctrl;<keycap>V</keycap></keycombo></shortcut>
++<guimenu>Edit</guimenu><guimenuitem>Paste</guimenuitem></menuchoice></term>
++<listitem>
++<para>This will insert the contents of the clipboard at the cursor position.
++The clipboard is feature of &kde; that works invisibly to provide a way to
++transfer data between applications.</para>
++</listitem>
++</varlistentry>
+ 
+-point.  A subsequent click on the corresponding button will cause all the  
+-selected actions to be undone or redone accordingly.  This would be particularly 
++<varlistentry>
++<term><anchor id="select-all"/><menuchoice>
++<shortcut><keycombo
++action="simul">&Ctrl;<keycap>A</keycap></keycombo></shortcut>
++<guimenu>Edit</guimenu><guimenuitem>Select All</guimenuitem></menuchoice></term>
++<listitem>
++<para>This will select the entire document. This could be very useful for
++copying the entire file to another application.</para>
++</listitem>
++</varlistentry>
+ 
+- 
+-useful when the user knows precisely the point to which she or he would like to  
++<varlistentry>
++<term><anchor id="deselect"/><menuchoice>
++<shortcut>
++<keycombo action="simul">&Ctrl;&Shift;<keycap>A</keycap></keycombo>
++</shortcut>
++<guimenu>Edit</guimenu><guimenuitem>Deselect</guimenuitem></menuchoice></term>
++<listitem>
++<para>Deselects the selected text in the editor if any.</para>
++</listitem>
++</varlistentry>
+ 
++<varlistentry>
++<term><anchor id="block-selection-mode"/><menuchoice>
++<shortcut>
++<keycombo action="simul">&Ctrl;&Shift;<keycap>B</keycap></keycombo>
++</shortcut>
++<guimenu>Edit</guimenu><guimenuitem>Bloc
++Selection Mode</guimenuitem></menuchoice></term>
++<listitem>
++<para>Toggles Selection Mode. When the Selection Mode is “BLOCK”, you can make
++vertical selections, ie select column 5 to 10 in lines 9 to 15.
++The status bar shows the current state of the Selection Mode, either “NORM” or
++“BLK”.</para>
++</listitem>
++</varlistentry>
+ 
+-proceed - making it unnecessary to go through a series of single undo or redo  
+-actions.</para>   
+-</listitem>  
+-</varlistentry>  //-->
+-  
+-<varlistentry>  
+-<term><anchor id="cut"/><menuchoice>  
+-<shortcut><keycombo 
+-action="simul">&Ctrl;<keycap>X</keycap></keycombo></shortcut>  
+-<guimenu>Edit</guimenu><guimenuitem>Cut</guimenuitem></menuchoice></term>  
+-<listitem>  
+-<para>This command deletes the current selection and places it on the clipboard. 
++<varlistentry>
++<term><anchor id="overwrite-mode"/><menuchoice>
++<shortcut>
++<keycombo action="simul"><keycap>Insert</keycap></keycombo>
++</shortcut>
++<guimenu>Edit</guimenu><guimenuitem>Overwrite
++Mode</guimenuitem></menuchoice></term>
++<listitem>
++<para>Toggles the Insert/Overwrite modes. When the mode is "INS", you
++insert characters where the cursor is. When the mode is "OVR", writing
++characters will replace the current characters if your cursor is positioned
++before any character. The status bar shows the current state of the Overwrite
++Mode, either “INS” or “OVR”.</para>
++</listitem>
++</varlistentry>
+ 
+- The  
+-clipboard is a feature of KDE that works invisibly to provide a way to transfer 
+-data between  
+-applications.</para>  
+-</listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
+-<term><anchor id="copy"/><menuchoice>  
+-<shortcut><keycombo 
+-action="simul">&Ctrl;<keycap>C</keycap></keycombo></shortcut>  
+-<guimenu>Edit</guimenu><guimenuitem>Copy</guimenuitem></menuchoice></term>  
+-<listitem>  
+-<para>This copies the currently selected text to the clipboard so that it may be 
++<varlistentry>
++<term><anchor id="find"/><menuchoice>
++<shortcut><keycombo
++action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut>
++<guimenu>Edit</guimenu><guimenuitem>Find</guimenuitem></menuchoice></term>
++<listitem>
++<para>This opens the find dialog which is used to specify the <guilabel>Text to
++Find</guilabel> in the document. There is small text box for entering the search
++pattern which also doubles as a dropdown box. Clicking on the dropdown arrow at
++the side of the box makes available other recent search patterns. Other
++parameters are included to make the search more efficient. Selecting
++<guilabel>Case Sensitive</guilabel> will limit finds to entries that match the
++case (upper or lower) of each of the characters in the search  pattern.
++<guilabel>Find Backwards</guilabel> directs the search to proceed in an upwardly
++direction. The <guilabel>Selected Text</guilabel> option keeps the  search
++within currently selected text. Checking <guilabel>Whole Words Only</guilabel>
++prevents the search from stopping on words that contain the searched for
++pattern. The <guilabel>Search from Cursor</guilabel> option begins the search
++from the current position of the cursor within the document rather  than from
++the beginning.</para>
++</listitem>
++</varlistentry>
+ 
+- 
+-pasted elsewhere.  The clipboard is a feature of KDE that works invisibly to  
+-provide a way to transfer data between applications.</para>   
+-</listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
+-<term><anchor id="paste"/><menuchoice>  
+-<shortcut><keycombo 
+-action="simul">&Ctrl;<keycap>V</keycap></keycombo></shortcut>  
+-<guimenu>Edit</guimenu><guimenuitem>Paste</guimenuitem></menuchoice></term>  
+-<listitem>  
+-<para>This will insert the contents of the clipboard at the cursor position. The 
++<varlistentry>
++<term><anchor id="find-again"/><menuchoice>
++<shortcut><keycombo action="simul"><keycap>F3</keycap></keycombo></shortcut>
++<guimenu>Edit</guimenu><guimenuitem>Find Next</guimenuitem></menuchoice></term>
++ <listitem>
++<para>This repeats the last find operation, if any, without calling the find
++dialog box.
++</para>
++</listitem>
++</varlistentry>
+ 
+- 
+-clipboard is feature of KDE that works invisibly to provide a way to transfer  
+-data between applications.</para>  
+-</listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
+-<term><anchor id="select-all"/><menuchoice>  
+-<shortcut><keycombo 
+-action="simul">&Ctrl;<keycap>A</keycap></keycombo></shortcut>
+-<guimenu>Edit</guimenu><guimenuitem>Select All</guimenuitem></menuchoice></term>
+-<listitem>  
+-<para>This will select the entire document. This could be very useful for  
+-copying the entire file to another application.</para>  
+-</listitem>  
+-</varlistentry>  
+-  
+-<!--<varlistentry>  
+-<term><anchor id="invert-the-selection"/><menuchoice>  
+-<guimenu>Edit</guimenu><guimenuitem>Invert 
+-Selection</guimenuitem></menuchoice></term>  
+-<listitem>  
+-<para>This selects any unselected text while unselecting any selected text -  
+-effectively reversing the current state of selection.</para>  
+-</listitem>  
+-</varlistentry>  //-->
+-  
+-<varlistentry>  
++<varlistentry>
++<term id="find-previous">
++<menuchoice>
++<shortcut>
++<keycombo action="simul">&Shift;<keycap>F3</keycap></keycombo>
++</shortcut>
++<guimenu>Edit</guimenu>
++<guimenuitem>Find Previous</guimenuitem>
++</menuchoice>
++</term>
++<listitem>
++<para>
++This repeats the last find operation, if any, without calling the find
++dialog box, and searching backwards instead of forwards through the
++document.
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="replace"/><menuchoice>
++<shortcut><keycombo
++action="simul">&Ctrl;<keycap>R</keycap></keycombo></shortcut>
++<guimenu>Edit</guimenu><guimenuitem>Replace...</guimenuitem></menuchoice></term>
++<listitem>
++<para>This command opens the replace dialog box. The replace dialog is
++almost identical to the above-mentioned find dialog. In addition to the features
++in the find dialog it contains a <guilabel>Replace With:</guilabel> text
++entry/dropdown box.  Using this dialog the user can specify both the text to be
++found and text with which to replace it. The additional <guilabel>Prompt
++On Replace</guilabel> option allows the user to have &kwrite; ask for
++confirmation before each replacement.
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
+ <term id="go-to-line">
+-<menuchoice>  
++<menuchoice>
+ <shortcut>
+ <keycombo action="simul">&Ctrl;<keycap>G</keycap></keycombo>
+ </shortcut>
+ <guimenu>Edit</guimenu>
+-<guimenuitem>Go to line</guimenuitem></menuchoice></term>  
+-<listitem>  
++<guimenuitem>Go to line</guimenuitem></menuchoice></term>
++<listitem>
+ <para>
+ This opens the goto line dialog box which is used to have the cursor
+ jump to a particular line (specified by number) in the document.  The
+@@ -680,162 +953,380 @@
+ arrow decrease it.  There is also a slide control to the right of the
+ text box which allows the user to move the goto point in the document in
+ an analog manner.
+-</para> 
+-</listitem> 
++</para>
++</listitem>
+ </varlistentry>
+-        
+-<varlistentry>  
+-<term><anchor id="find"/><menuchoice>  
+-<shortcut><keycombo 
+-action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut>
+-<guimenu>Edit</guimenu><guimenuitem>Find</guimenuitem></menuchoice></term>
+-<listitem>  
+-<para>This opens the find dialog which is used to specify the <guilabel>Text to  
+-Find</guilabel> in the document. There is small text box for entering the search 
+-pattern which also doubles as a dropdown box. Clicking on the dropdown arrow at  
+-the side of the box makes available other recent search patterns. Other  
+-parameters are included to make the search more efficient. Selecting  
+-<guilabel>Case Sensitive</guilabel> will limit finds to entries that match the  
+-case (upper or lower) of each of the characters in the search  
+-pattern. <guilabel>Find Backwards</guilabel> directs the search to proceed in an 
+-upwardly direction. The <guilabel>Selected Text</guilabel> option keeps the  
+-search within currently selected text. Checking <guilabel>Whole Words
+-Only</guilabel> prevents the search from stopping on words that contain the
+-searched for pattern. The <guilabel>Search from Cursor</guilabel> option begins  
+-the search from the current position of the cursor within the document rather  
+-than from the beginning.</para>   
+-</listitem>  
+-</varlistentry>  
++</variablelist>
+ 
+-<varlistentry>  
+-<term><anchor id="find-again"/><menuchoice>  
+-<shortcut><keycombo action="simul"><keycap>F3</keycap></keycombo></shortcut>  
+-<guimenu>Edit</guimenu><guimenuitem>Find Next</guimenuitem></menuchoice></term>  
++</sect1>
++<sect1 id="view-menu">
++<title>The <guimenu>View</guimenu> menu</title>
+ 
++<para>The <guimenu>View</guimenu> menu allows you to manage settings
++specific to the active editor, and to manage frames.</para>
+ 
+-<listitem>  
+-<para>This repeats the last find operation, if any, without calling the find  
+-dialog box.</para> </listitem>  
+-</varlistentry>  
+-  
++<variablelist>
++
+ <varlistentry>
+-<term id="find-previous">
++<term>
++<anchor id="view-new-window"/>
+ <menuchoice>
+-<shortcut>
+-<keycombo action="simul">&Shift;<keycap>F3</keycap></keycombo>
+-</shortcut>
+-<guimenu>Edit</guimenu>
+-<guimenuitem>Find Previous</guimenuitem>
++<guimenu>View</guimenu>
++<guimenuitem>New Window</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>
+-This repeats the last find operation, if any, without calling the find  
+-dialog box, and searching backwards instead of forwards through the
+-document.
+-</para>
++<para>Opens a new window with the same text.</para>
+ </listitem>
+ </varlistentry>
+ 
+-<varlistentry>  
+-<term><anchor id="replace"/><menuchoice>  
+-<shortcut><keycombo 
+-action="simul">&Ctrl;<keycap>R</keycap></keycombo></shortcut>  
+-<guimenu>Edit</guimenu><guimenuitem>Replace</guimenuitem></menuchoice></term>
+-<listitem>  
+-<para>This command opens the replace dialog box.  The replace dialog is  
+-almost identical to the above-mentioned find dialog.  In addition to the features in
+-the find dialog it contains a <guilabel>Replace With:</guilabel> text
+-entry/dropdown box.  Using this dialog the user can specify both the text to be found
+-and text with which to replace it.  The additional <guilabel>Prompt
+-On Replace</guilabel> option allows the user to have &kwrite; ask for
+-confirmation before each replacement.</para> </listitem>
++<varlistentry>
++<term>
++<anchor id="view-command-line"/>
++<menuchoice>
++<shortcut><keycombo
++action="simul"><keycap>F7</keycap></keycombo></shortcut>
++<guimenu>View</guimenu>
++<guimenuitem>Switch to Command Line</guimenuitem>
++</menuchoice>
++</term>
++<listitem>
++<para>Displays the Katepart command line at the bottom of the window.
++In the command line, type "help" to get help and "help list" to get a list of
++commands.</para>
++</listitem>
+ </varlistentry>
+ 
+-<!--<varlistentry>
++<varlistentry>
+ <term>
++<anchor id="view-schema"/>
+ <menuchoice>
+-<shortcut>
+-<keycombo action="simul">&Ctrl;<keycap>M</keycap></keycombo>
+-</shortcut>
+-<guimenu>Edit</guimenu>
+-<guimenuitem>Editing Command</guimenuitem>
++<guimenu>View</guimenu>
++<guimenuitem>Schema</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>
+-To be written
+-</para>
++<para>Select a font schema.</para>
+ </listitem>
+-</varlistentry>//-->
++</varlistentry>
++
++<varlistentry>
++<term>
++<anchor id="view-dynamic-word-wrap"/>
++<menuchoice>
++<shortcut><keycombo action="simul"><keycap>F10</keycap></keycombo></shortcut>
++<guimenu>View</guimenu>
++<guimenuitem>Dynamic Word Wrap</guimenuitem>
++</menuchoice>
++</term>
++<listitem>
++<para>The text lines will be wrapped at the view
++border on the screen.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term>
++<anchor id="view-dynamic-word-wrap-indicators"/>
++<menuchoice>
++<shortcut><keycombo action="simul"><keycap>F10</keycap></keycombo></shortcut>
++<guimenu>View</guimenu>
++<guimenuitem>Dynamic Word Wrap Indicators</guimenuitem>
++</menuchoice>
++</term>
++<listitem>
++ <para>Choose when and how the dynamic word wrap indicators should be
++displayed. This is only available if the <guilabel>Dynamic Word
++Wrap</guilabel> option is checked.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term>
++<anchor id="view-show-static-word-wrap"/>
++<menuchoice>
++<guimenu>View</guimenu>
++<guimenuitem>Show Static Word Wrap Marker</guimenuitem>
++</menuchoice>
++</term>
++<listitem>
++<para>If this option is checked, a vertical line will be drawn at the
++word wrap column as defined in the <menuchoice>
++<guimenu>Settings</guimenu>
++<guimenuitem>Configure Editor...</guimenuitem></menuchoice> in the
++Editing tab. Please note that the word wrap marker is only drawn if you
++use a fixed pitch font.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term>
++<anchor id="view-show-icon-border"/>
++<menuchoice>
++<shortcut><keycombo action="simul"><keycap>F6</keycap></keycombo></shortcut>
++<guimenu>View</guimenu>
++<guimenuitem>Show Icon Border</guimenuitem>
++</menuchoice>
++</term>
++<listitem>
++<para>This is a toggle item. Setting it on checked will make the
++side of the active editor, and vice versa.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term>
++<anchor id="view-show-line-numbers"/>
++<menuchoice>
++<shortcut><keycombo action="simul"><keycap>F11</keycap></keycombo></shortcut>
++<guimenu>View</guimenu>
++<guimenuitem>Show Line Numbers</guimenuitem>
++</menuchoice>
++</term>
++<listitem>
++<para>This is a toggle Item. Setting it on checked will make a pane displaying
++the line numbers of the document visible in the left border of the active
++editor, and vice versa.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term>
++<anchor id="view-scrollbar-marks"/>
++<menuchoice>
++<guimenu>View</guimenu>
++<guisubmenu>Show Scrollbar Marks</guisubmenu>
++</menuchoice>
++</term>
++<listitem>
++<para>If this option is checked, the view will show marks on the vertical
++scrollbar.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term>
++<anchor id="view-hide-folding-markers"/>
++<menuchoice>
++<shortcut><keycombo action="simul"><keycap>F9</keycap></keycombo></shortcut>
++<guimenuitem>Hide Folding Markers</guimenuitem>
++</menuchoice>
++</term>
++<listitem>
++<para>If this option is checked, the marks for code folding will be
++hidden.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term>
++<anchor id="view-code-folding"/>
++<menuchoice>
++<guimenuitem>Code Folding</guimenuitem>
++</menuchoice>
++</term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><menuchoice><shortcut><keycombo action="simul"><keycap>Ctrl</keycap>
++<keycap>Shift</keycap><keycap>-</keycap></keycombo></shortcut>
++<guimenuitem>Collapse Toplevel</guimenuitem></menuchoice>
++</term>
++<listitem><para>Collapse all toplevel regions in the document.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><menuchoice><shortcut><keycombo action="simul"><keycap>Ctrl</keycap>
++<keycap>Shift</keycap><keycap>+</keycap></keycombo></shortcut>
++<guimenuitem>Expand Toplevel</guimenuitem></menuchoice>
++</term>
++<listitem><para>Expand all toplevel regions in the document.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><menuchoice><shortcut><keycombo action="simul"><keycap>Ctrl</keycap>
++<keycap>-</keycap></keycombo></shortcut>
++<guimenuitem>Collapse One Local Level</guimenuitem></menuchoice>
++</term>
++<listitem><para>Collapse the region closest to the cursor.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><menuchoice><shortcut><keycombo action="simul"><keycap>Ctrl</keycap>
++<keycap>+</keycap></keycombo></shortcut>
++<guimenuitem>Expand One Local Level</guimenuitem></menuchoice>
++</term>
++<listitem><para>Expand the region closest to the cursor.</para></listitem>
++</varlistentry>
+ </variablelist>
++</listitem>
++</varlistentry>
+ 
+-</sect1>  
+-  
+-<sect1 id="go">  
+-<title>The <guimenu>Bookmarks</guimenu> Menu</title>  
+-<variablelist>  
+-<!--
++</variablelist>
++
++</sect1>
++
++<sect1 id="go">
++<title>The <guimenu>Bookmarks</guimenu> Menu</title>
++<variablelist>
++
+ <varlistentry>
+-<term id="toggle-bookmarks">
++<term id="set-bookmark">
+ <menuchoice>
+ <shortcut>
+ <keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo>
+ </shortcut>
+ <guimenu>Bookmarks</guimenu>
+-<guimenuitem>Toggle Bookmark</guimenuitem>
++<guimenuitem>Set Bookmark</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+ <para>
+-To be written
++Sets or removes a bookmark in the current line of the active document. (If it's
++there, it is removed, otherwise one is set).
+ </para>
+ </listitem>
+ </varlistentry>
+--->
++
+ <varlistentry>
+ <term id="clear-bookmarks">
+-<menuchoice>  
++<menuchoice>
+ <guimenu>Bookmarks</guimenu>
+ <guimenuitem>Clear All Bookmarks</guimenuitem>
+ </menuchoice>
+-</term>  
+-<listitem>  
++</term>
++<listitem>
+ <para>
+ This command will remove all the markers from the document as well as
+-the list of markers which is appended at the bottom of this menu
+-item.
+-</para> 
+-</listitem> 
+-</varlistentry> 
++the list of markers which is appended at the bottom of this menu item.
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry id="bookmarks-previous">
++<term><menuchoice><shortcut><keycombo action="simul"><keycap>Alt</keycap>
++<keycap>Page Up</keycap></keycombo></shortcut>
++<guimenu>Bookmarks</guimenu><guimenuitem>Previous</guimenuitem></menuchoice>
++</term>
++<listitem><para>This will move the cursor to beginning of the first above line
++with a bookmark. The menuitem text will include the line number and the first
++piece of text on the line. This item is only available when there is a bookmark
++in a line above the cursor.</para></listitem>
++</varlistentry>
++
++<varlistentry id="bookmarks-next">
++<term><menuchoice><shortcut><keycombo action="simul"><keycap>Alt</keycap>
++<keycap>Page Down</keycap></keycombo></shortcut>
++<guimenu>Bookmarks</guimenu><guimenuitem>Next</guimenuitem></menuchoice></term>
++<listitem><para>This will move the cursor to beginning of the next line with a
++bookmark. The menuitem text will include the line number and the first piece of
++text on the line. This item is only available when there is a bookmark in a line
++below the cursor.</para></listitem>
++</varlistentry>
++
+ </variablelist>
+-  
++
+ <para>
+ At the bottom of this menu, a list of markers appears if any markers are
+ available for this window.
+ </para>
+ 
+-</sect1>  
+-  
+-<sect1 id="tools">  
+-<title>The <guimenu>Tools</guimenu> Menu</title>  
+-  
++</sect1>
++
++<sect1 id="tools">
++<title>The <guimenu>Tools</guimenu> Menu</title>
++
+ <variablelist>
+ <varlistentry>
++<term><anchor id="tools-read-only"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Read Only Mode</guimenuitem></menuchoice></term>
++ <listitem>
++<para>Set the current document to Read Only mode. This prevents any text
++addition and any changes in the document formatting.</para>
++ </listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-filetype"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Filletype</guimenuitem></menuchoice></term>
++ <listitem>
++<para>Choose the filetype scheme you prefer for the active document. This
++overwrites the global filetype mode set in <menuchoice>
++<guimenu>Settings</guimenu>
++<guimenuitem>Configure
++Editor...</guimenuitem></menuchoice> in the Filetypes tab for your current
++document only.</para>
++ </listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-highlighting"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Highlighting</guimenuitem></menuchoice></term>
++ <listitem>
++<para>Choose the Highlighting scheme you prefer for the active document. This
++overwrites the global highlighting mode set in <menuchoice>
++<guimenu>Settings</guimenu>
++<guimenuitem>Configure
++Editor...</guimenuitem></menuchoice> for your current document only.</para>
++ </listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-indentation"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Indentation</guimenuitem></menuchoice></term>
++ <listitem>
++<para>Choose the style of indentation you want for your active document.
++This overwrites the global indentation mode set in <menuchoice>
++<guimenu>Settings</guimenu>
++<guimenuitem>Configure
++Editor...</guimenuitem></menuchoice> for your current document only.</para>
++ </listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-encoding"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Encoding</guimenuitem></menuchoice></term>
++ <listitem>
++<para>You can overwrite the default encoding set in <menuchoice>
++<guimenu>Settings</guimenu>
++<guimenuitem>Configure
++Editor...</guimenuitem></menuchoice> in the <guilabel>Open/Save</guilabel> tab
++to set a different encoding for your current document. The encoding you
++set here will be only valid for your current document.</para>
++ </listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-end-of-line"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>End of Line</guimenuitem></menuchoice></term>
++ <listitem>
++<para>Choose your prefered end of line mode for your active
++document. This overwrites the global end of line mode set in <menuchoice>
++<guimenu>Settings</guimenu>
++<guimenuitem>Configure
++Editor...</guimenuitem></menuchoice> for your current document only.</para>
++ </listitem>
++</varlistentry>
++
++<varlistentry>
+ <term><anchor id="Spelling..."/><menuchoice>
+-<guimenu>Tools</guimenu><guimenuitem>Spelling...</guimenuitem></menuchoice></term>
++<guimenu>Tools</guimenu><guimenuitem>Spelling...</guimenuitem></menuchoice>
++</term>
+ 
+-<listitem><para><action>This initiates the spell checking program - a program
++<listitem><para><action>This initiates the spellchecking program - a program
+ designed to help the user catch and correct any spelling errors.</action>
+ Clicking on this entry will start the checker and bring up the speller dialog
+-box through which the user can control the process.  There are four settings 
++box through which the user can control the process.  There are four settings
+ lined up vertically in the center of the dialog with their corresponding labels
+ just to the left.  Starting at the top they are:</para>
+ 
+ <variablelist>
+ <varlistentry>
+ <term><guilabel>Unknown word:</guilabel></term>
+-<listitem><para>Here, the spell checker indicates the word currently under
++<listitem><para>Here, the spellchecker indicates the word currently under
+ consideration.  This happens when the checker encounters a word not in its
+ dictionary - a file containing a list of correctly spelled words against which
+ it compares each word in the editor.</para></listitem>
+@@ -856,12 +1347,13 @@
+ </varlistentry>
+ <varlistentry>
+ <term><guilabel>Language:</guilabel></term>
+-<listitem><para> If you have installed multiple dictionaries, here you can select which dictionary/language should be used.</para></listitem>
++<listitem><para> If you have installed multiple dictionaries, here you can
++select which dictionary/language should be used.</para></listitem>
+ </varlistentry>
+ </variablelist>
+ 
+ <para>On the right side of the dialog box are 5 buttons that allow the user to
+-control the spell check process.  They are:</para>
++control the spellcheck process.  They are:</para>
+ 
+ <variablelist>
+ <varlistentry>
+@@ -893,81 +1385,126 @@
+ <term><guibutton>Ignore All</guibutton></term>
+ <listitem><para> This button tells the checker to do nothing with the current
+ <guilabel>Unknown word:</guilabel> and to pass over any other instances of
+-the same word.</para> <note><para>This only applies to the current spell check
++the same word.</para> <note><para>This only applies to the current spellcheck
+ run.  If the checker is run again later it will stop on this same
+ word.</para></note></listitem>
+ </varlistentry>
+ </variablelist>
+ 
+-<!--<para>Located horizontally along the bottom of the spell check dialog is a
++<!--<para>Located horizontally along the bottom of the spellcheck dialog is a
+ progress bar.  As the checking process proceeds the bar will fill from left to
+ right providing a graphical representation of how far along in the document the
+ process has reached.  In addition, the progress is displayed numerically in
+ the center of the progress bar.</para>//-->
+ 
+-<!--<note><para>A numerical display of the spell check
++<!--<note><para>A numerical display of the spellcheck
+ process is simultaneously displayed in the status bar of the editor.  The <link
+ linkend="show-statusbar">status bar</link> is the horizontal strip at the bottom
+ of the editor just outside of the text entry area.</para></note>//-->
+ 
+-<para>Three more buttons are located horizontally along the bottom of the spell check dialog.  They are:</para>
++<para>Three more buttons are located horizontally along the bottom of the
++spellcheck dialog.  They are:</para>
+ 
+ <variablelist>
+ <varlistentry>
+ <term><guibutton>Help</guibutton></term>
+-<listitem><para> This invokes the KDE help system starting at the &kwrite; help
++<listitem><para> This invokes the &kde; help system starting at the &kwrite; help
+ pages (this document).</para></listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+ <term><guibutton>Finished</guibutton></term>
+-<listitem><para> This button ends the spell check process, and returns to the document.</para></listitem>
++<listitem><para> This button ends the spellcheck process, and returns to the
++document.</para></listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+ <term><guibutton>Cancel</guibutton></term>
+-<listitem><para> This button cancels the spell check process, all modifications are reverted, and you will return to your document.</para></listitem>
++<listitem><para> This button cancels the spellcheck process, all modifications
++are reverted, and you will return to your document.</para></listitem>
+ </varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
++</variablelist>
+ 
+-<varlistentry>  
+-<term><anchor id="indent"/><menuchoice>  
++<variablelist>
++<varlistentry>
++<term><anchor id="tools-spelling-from-cursor"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Spelling (from cursor)...</guimenuitem></menuchoice></term>
++ <listitem>
++<para>This initiates the spellchecking program but it starts where your cursor
++is instead of at the beginning of the document.</para>
++ </listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-spellcheck-selection"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Spellcheck Selection...</guimenuitem></menuchoice></term>
++ <listitem>
++<para>Spellchecks the current selection.</para>
++ </listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="indent"/><menuchoice>
+ <shortcut>
+ <keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo>
+ </shortcut>
+-<guimenu>Tools</guimenu><guimenuitem>Indent</guimenuitem></menuchoice></term>  
+-<listitem>  
++<guimenu>Tools</guimenu><guimenuitem>Indent</guimenuitem></menuchoice></term>
++<listitem>
+ <para>This increases the paragraph's indentation by one step. The size of the
+-step depends on the <link linkend="pref-indent"> indentation  
+-settings</link>.</para>  
+-</listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
++step depends on the <link linkend="pref-indent"> indentation
++settings</link>.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
+ <term><anchor id="unindent"/><menuchoice>
+ <shortcut>
+ <keycombo action="simul">&Ctrl;&Shift;<keycap>I</keycap></keycombo>
+ </shortcut>
+-<guimenu>Tools</guimenu><guimenuitem>Unindent</guimenuitem></menuchoice></term>  
+-<listitem>  
+-<para>This reduces the paragraph's indentation by one step. The size of the step  
+-depends on the <link linkend="pref-indent"> indentation settings</link>.</para>  
+-</listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
++<guimenu>Tools</guimenu><guimenuitem>Unindent</guimenuitem></menuchoice></term>
++
++<listitem>
++<para>This reduces the paragraph's indentation by one step. The size of the step
++
++depends on the <link linkend="pref-indent"> indentation settings</link>.</para>
++
++</listitem>
++</varlistentry>
++
++<varlistentry>
+ <term><anchor id="cleanindent"/><menuchoice>
+ <guimenu>Tools</guimenu><guimenuitem>Clean
+-Indentation</guimenuitem></menuchoice></term>  <listitem>  
+-<para>Not yet implemented</para>
+-</listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
++Indentation</guimenuitem></menuchoice></term>  <listitem>
++<para>This cleans the indentation for the current selection or for the
++line the cursor is currently in. Cleaning the indentation ensures that
++all your selected text follows the indentation mode you choose.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="tools-align"/><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Align</guimenuitem>
++</menuchoice></term>
++<listitem>
++<para>Causes a realign of the current line or selected lines using the
++indentation mode and indentation settings in the doucment.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
+ <term><menuchoice>
+ <shortcut>
+ <keycombo action="simul">&Ctrl;<keycap>D</keycap></keycombo>
+ </shortcut>
+-<guimenu>Tools</guimenu><guimenuitem>Comment</guimenuitem></menuchoice></term>
++<guimenu>Tools</guimenu>
++<guimenuitem>Comment</guimenuitem>
++</menuchoice></term>
+ <listitem><para>This adds one space to the beginning of the line
+ where the text cursor is located or to the beginning of any
+ selected lines.</para>
+@@ -979,16 +1516,79 @@
+ <shortcut>
+ <keycombo action="simul">&Ctrl;&Shift;<keycap>D</keycap></keycombo>
+ </shortcut>
+-<guimenu>Tools</guimenu><guimenuitem>Uncomment</guimenuitem></menuchoice></term>
+-<listitem><para>This removes one space (if any exist) from the beginning of the line
+-where the text cursor is located or from the beginning of any
++<guimenu>Tools</guimenu>
++<guimenuitem>Uncomment</guimenuitem>
++</menuchoice></term>
++<listitem><para>This removes one space (if any exist) from the beginning of the
++line where the text cursor is located or from the beginning of any
+ selected lines.</para></listitem>
+ </varlistentry>
+-</variablelist>
+-</listitem>
++
++<varlistentry>
++<term><menuchoice>
++<shortcut>
++<keycombo action="simul">&Ctrl;<keycap>U</keycap></keycombo>
++</shortcut>
++<guimenu>Tools</guimenu>
++<guimenuitem>Uppercase</guimenuitem>
++</menuchoice></term>
++<listitem><para>Put the selected text or the letter after the cursor in
++uppercase.</para></listitem>
+ </varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<shortcut>
++<keycombo action="simul">&Ctrl;&Shift;<keycap>U</keycap></keycombo>
++</shortcut>
++<guimenu>Tools</guimenu>
++<guimenuitem>Lowercase</guimenuitem>
++</menuchoice></term>
++<listitem><para>Put the selected text or the letter after the cursor in
++lowercase.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<shortcut>
++<keycombo action="simul">&Alt;&Ctrl;<keycap>U</keycap></keycombo>
++</shortcut>
++<guimenu>Tools</guimenu>
++<guimenuitem>Capitalize</guimenuitem>
++</menuchoice></term>
++<listitem><para>Capitalize the selected text or the current
++word.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<shortcut>
++<keycombo action="simul">&Ctrl;<keycap>J</keycap></keycombo>
++</shortcut>
++<guimenu>Tools</guimenu>
++<guimenuitem>Join Lines</guimenuitem>
++</menuchoice></term>
++<listitem><para>Joins the selected lines, or the current line and the line below
++with one white space character as a separator. Leading/trailing white space on
++joined lines is removed in the affected ends.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<guimenu>Tools</guimenu>
++<guimenuitem>Word Wrap Document</guimenuitem>
++</menuchoice></term>
++<listitem><para>Apply static word wrapping on all the document. That means that
++a new line of text will automatically start when the current
++line exceeds the length specified by the Wrap words at: option
++in the Editing tab in <menuchoice>
++<guimenu>Settings</guimenu><guimenuitem>Configure
++Editor...</guimenuitem></menuchoice></para></listitem>
++</varlistentry>
++
+ </variablelist>
+ 
++
+ </sect1>
+ 
+ <sect1 id="settings">
+@@ -996,40 +1596,42 @@
+ 
+ <variablelist>
+ <varlistentry>
+-<term><anchor id="show-toolbar"/><menuchoice>  
++<term><anchor id="show-toolbar"/><menuchoice>
+ <guimenu>Settings</guimenu>
+ <guimenuitem>Show Toolbar</guimenuitem>
+ </menuchoice>
+-</term>  
+-<listitem>  
++</term>
++<listitem>
+ <para>
+ When checked, this displays a movable toolbar containing buttons used to
+ initiate frequently used commands. When unchecked the toolbar is hidden.
+-</para> 
+-</listitem> 
++</para>
++</listitem>
+ </varlistentry>
+-  
+-<varlistentry>  
+-<term><anchor id="show-statusbar"/><menuchoice>  
+-<guimenu>Settings</guimenu><guimenuitem>Show Statusbar</guimenuitem></menuchoice></term>  
+-<listitem>  
+-<para>When checked, this displays a small bar at the bottom of the editor  
+-containing information about the status of the current document.  When unchecked  
+-the statusbar is hidden.</para>     
+-</listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
+-<term><anchor id="show-path"/><menuchoice>  
+-<guimenu>Settings</guimenu><guimenuitem>Show Path</guimenuitem></menuchoice></term>
+-<listitem>  
+-<para>When selected, this displays in the title bar the path (its location in the
++
++<varlistentry>
++<term><anchor id="show-statusbar"/><menuchoice>
++<guimenu>Settings</guimenu><guimenuitem>Show
++Statusbar</guimenuitem></menuchoice></term>
++<listitem>
++<para>When checked, this displays a small bar at the bottom of the editor
++containing information about the status of the current document.  When unchecked
++the statusbar is hidden.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="show-path"/><menuchoice>
++<guimenu>Settings</guimenu><guimenuitem>Show
++Path</guimenuitem></menuchoice></term>
++<listitem>
++<para>When selected, this displays in the titlebar the path (its location in the
+ file system) of the current document.  When unchecked the path is hidden.</para>
+-</listitem>  
+-</varlistentry>  
++</listitem>
++</varlistentry>
+ 
+-<varlistentry>  
+-<term><anchor id="preferences"/><menuchoice>  
++<varlistentry>
++<term><anchor id="preferences"/><menuchoice>
+ <guimenu>Settings</guimenu>
+ <guimenuitem>Configure Editor...</guimenuitem>
+ </menuchoice>
+@@ -1037,63 +1639,87 @@
+ <listitem>
+ <para>
+ This menu item opens a dialog whereby several different <link
+-linkend="pref-dialog">settings</link> may be adjusted.  
++linkend="pref-dialog">settings</link> may be adjusted.
+ </para>
+-</listitem> 
++</listitem>
+ </varlistentry>
+-  
+-<varlistentry>  
+-<term><anchor id="configure-keybindings"/><menuchoice>  
+-<guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts...</guimenuitem></menuchoice></term>  
+-<listitem>  
+-<para>This command opens a dialog box whereby the <link  
+-linkend="keybindings">key bindings</link> may be changed.  A display window at
+-the top of the dialog box shows the list of commands (actions) that can have
+-keyboard shortcuts.  Below the display are three radio buttons.  The user may choose
+-between No Key, Default Key, and Custom Key.  (Note that a set of radio buttons only
+-allows the selection of one of the offered items - in the way that buttons on a car
+-radio only offer the selection of one preset station.  Also, the Default Key
+-selection  is only available for those commands that actually have a 'default'
+-shortcut.)  Selecting the Custom Key option activates the three check boxes and key
+-button at the bottom of the dialog. The user may then select a key
+-combination for the command in question by means of the check boxes and key
+-button. For example, with the About KDE command selected in the display window,  
+-the user could select &Ctrl; and <keycap>Alt</keycap>, click on  
+-the key button, and then press the <keycap>K</keycap> key on the keyboard.  This  
+-would mean that anytime he or she held down the &Ctrl; and  
+-<keycap>Alt</keycap> buttons and pressed <keycap>K</keycap> (while using  
+-&kwrite;) the About KDE display box would be called. </para>   
+-</listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
+-<term><anchor id="configure-toolbars"/><menuchoice>  
+-<guimenu>Settings</guimenu><guimenuitem>Configure Toolbars...</guimenuitem></menuchoice></term>  
++
++<varlistentry>
++<term><anchor id="choose-editor"/><menuchoice>
++<guimenu>Settings</guimenu>
++<guimenuitem>Choose Editor...</guimenuitem>
++</menuchoice>
++</term>
++<listitem>
++<para>
++Choose the default text editing component that you wish to use in &kwrite;. You
++can choose <guilabel>System Default</guilabel>, <guilabel>Embedded
++Advanced Text Editor</guilabel> or <guilabel>&Qt; Designer Based
++Text Editor</guilabel> (note that the &Qt; Designer Based Text Editor is
++only available if you have KDevelop installed on your system). If you choose
++<guilabel>System Default</guilabel>, &kwrite; will honor your changes in
++&kcontrolcenter;.  All other choices will override that setting.
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="configure-keybindings"/><menuchoice>
++<guimenu>Settings</guimenu><guimenuitem>Configure
++Shortcuts...</guimenuitem></menuchoice></term>
++<listitem>
++<para>This command opens a dialog box whereby the <link
++linkend="keybindings">shortcuts</link> may be changed.  A display window at the
++top of the dialog box shows the list of commands (actions) that can have
++keyboard shortcuts.  Below the display are three radio buttons.  The user may
++choose between No Key, Default Key, and Custom Key.  (Note that a set of radio
++buttons only allows the selection of one of the offered items - in the way that
++buttons on a car radio only offer the selection of one preset station.  Also,
++the Default Key selection  is only available for those commands that actually
++have a 'default' shortcut.)  Selecting the Custom Key option activates the three
++check boxes and key button at the bottom of the dialog. The user may then select
++a key combination for the command in question by means of the check boxes and
++key button. For example, with the About &kde; command selected in the display
++window, the user could select &Ctrl; and <keycap>Alt</keycap>, click on  the key
++button, and then press the <keycap>K</keycap> key on the keyboard.  This would
++mean that anytime he or she held down the &Ctrl; and  <keycap>Alt</keycap>
++buttons and pressed <keycap>K</keycap> (while using
++&kwrite;) the About &kde; display box would be called. </para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><anchor id="configure-toolbars"/><menuchoice>
++<guimenu>Settings</guimenu><guimenuitem>Configure
++Toolbars...</guimenuitem></menuchoice></term>
+ <listitem><para>This will open the dialog whereby the toolbar configuration may
+-be changed.   The user can choose which shortcut buttons should appear on the  
++be changed.   The user can choose which shortcut buttons should appear on the
+ toolbar. A display window on the left lists the commands available to placed
+-on the toolbar.  A display on the right lists those commands already on the  
+-toolbar.  A set of four arrow buttons between the two displays manipulates the  
+-selections.  The right pointing arrow places any command selected in the left  
+-pane onto the right pane, <abbrev>i.e.</abbrev>, it is added to the toolbar.  
+-The left arrow does just the opposite, removing any action selected in the right  
+-window from the toolbar.  The up and down pointing arrows change the position of  
+-an action selected in the right window which changes the position of its button  
+-in the toolbar.</para> </listitem>   
+-</varlistentry>  
+-  
++on the toolbar.  A display on the right lists those commands already on the
++toolbar.  A set of four arrow buttons between the two displays manipulates the
++selections.  The right pointing arrow places any command selected in the left
++pane onto the right pane, <abbrev>i.e.</abbrev>, it is added to the toolbar.
++The left arrow does just the opposite, removing any action selected in the right
+ 
+-  
+-<!-- 
+-<varlistentry>  
++window from the toolbar.  The up and down pointing arrows change the position of
++
++an action selected in the right window which changes the position of its button
++
++in the toolbar.</para> </listitem>
++</varlistentry>
++
++
++
++<!--
++<varlistentry>
+ <term>
+ <menuchoice><guimenu>>Settings</guimenu><guimenuitem>Configure
+-Highlighting</guimenuitem></menuchoice></term>  
+-<listitem><para>Opens a dialog box allowing configuration of the syntax  
+-highlighting.  The dialog is described in <xref  
+-linkend="pref-highlighting"/>.</para></listitem>  
++Highlighting</guimenuitem></menuchoice></term>
++<listitem><para>Opens a dialog box allowing configuration of the syntax
++highlighting.  The dialog is described in <xref
++linkend="pref-highlighting"/>.</para></listitem>
+ </varlistentry>  -->
+-  
++
+ <!--<varlistentry>
+ <term>
+ <menuchoice>
+@@ -1121,62 +1747,65 @@
+ <guimenu>Settings</guimenu>
+ <guimenuitem>Vertical Selection</guimenuitem>
+ </menuchoice>
+-</term>  
+-<listitem>  
++</term>
++<listitem>
+ <para>
+-This is used to turn on or off the vertical selection feature.  Vertical  
+-selection allows text to be selected by column as well as by row.  In other  
+-words with this feature the user is able to select text contained in only  
+-particular contiguous columns and rows.  In affect the user can select a  
++This is used to turn on or off the vertical selection feature.  Vertical
++selection allows text to be selected by column as well as by row.  In other
++words with this feature the user is able to select text contained in only
++particular contiguous columns and rows.  In affect the user can select a
+ rectangular area of text anywhere in the document.
+-</para>  
+-</listitem>  
++</para>
++</listitem>
+ </varlistentry>  //-->
+-  
+-<!--<varlistentry>  
++
++<!--<varlistentry>
+ <term id="set-highlight">
+-<menuchoice>  
++<menuchoice>
+ <guimenu>Settings</guimenu>
+ <guisubmenu>Highlight Mode</guisubmenu>
+ </menuchoice>
+ </term>
+-<listitem>  
++<listitem>
+ <para>
+ This allows the user to choose the style of color highlighting which the
+ editor uses to display the text. The styles are selected by programming
+ language. The font/color information is not stored with the document.
+ </para>
+-</listitem>  
++</listitem>
+ </varlistentry>  //-->
+-  
+-<!--<varlistentry>  
++
++<!--<varlistentry>
+ <term><anchor id="end-of-line"/>
+-<menuchoice>  
+-<guimenu>Settings</guimenu><guisubmenu>End of Line</guisubmenu></menuchoice></term>  
+-<listitem>  
+-<para>This opens a sub-menu from which the user can select the type of <quote>end of  
+-line</quote> code for &kwrite; to use, <abbrev>i.e.</abbrev>, the accepted standard  
++<menuchoice>
++<guimenu>Settings</guimenu><guisubmenu>End of
++Line</guisubmenu></menuchoice></term>
++<listitem>
++<para>This opens a sub-menu from which the user can select the type of
++<quote>end of
++line</quote> code for &kwrite; to use, <abbrev>i.e.</abbrev>, the accepted
++standard
+ used by &UNIX;, &Mac; or MSDOS/&Windows; systems.</para>
+-</listitem>  
++</listitem>
+ </varlistentry>  //-->
+-  
+-</variablelist>  
+-</sect1>  
+-  
+-<sect1 id="help">  
+-<title>The <guimenuitem>Help</guimenuitem> Menu</title>  
+-  
++
++</variablelist>
++</sect1>
++
++<sect1 id="help">
++<title>The <guimenuitem>Help</guimenuitem> Menu</title>
++
+ &help.menu.documentation;
+ 
+-</sect1>  
++</sect1>
+ </chapter>
+-  
+-<chapter id="pref-dialog">  
++
++<chapter id="pref-dialog">
+ <title>Configure &kwrite;</title>
+ 
+ <para>
+ Selecting <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
+-Editor</guimenuitem></menuchoice> from the menu brings up the
++Editor...</guimenuitem></menuchoice> from the menu brings up the
+ <guilabel>Configure Editor</guilabel> dialog box.  This dialog can be
+ used to alter a number of different settings.  The settings available
+ for change vary according to which category the user chooses from a
+@@ -1192,358 +1821,790 @@
+ <guilabel>Fonts</guilabel> <guilabel>Indent</guilabel>,
+ <guilabel>Select</guilabel>, <guilabel>Edit</guilabel>,
+ <guilabel>Spelling</guilabel> and <guilabel>Highlighting</guilabel> are
+-detailed below.  
++detailed below.
+ </para>
+ 
++<sect1 id="appearance">
++<title>Appearance</title>
++
++<variablelist>
++<varlistentry>
++<term><guilabel>Word Wrap</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry id="appearance-settings">
++<term><guilabel>Dynamic word wrap</guilabel></term>
++<listitem><para>If this option is checked, the text lines
++will be wrapped at the view border on the screen.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Dynamic word wrap indicators</guilabel></term>
++<listitem><para>Choose when the Dynamic word wrap indicators
++should be displayed.
++</para></listitem></varlistentry>
++<varlistentry>
++<term><guilabel>Vertically align dynamically wrapped lines
++to indentation depth:
++</guilabel></term>
++<listitem><para>Enables the start of dynamically wrapped
++lines to be aligned  vertically to the indentation level of the first
++line.  This can help to make code and markup more
++readable.</para><para>Additionally, this allows you to
++set a maximum width of the screen, as a percentage,
++after which dynamically wrapped lines will no longer be vertically aligned.
++For example, at 50%, lines whose indentation levels are deeper than 50% of the
++width of the screen will not have vertical alignment applied to subsequent
++wrapped lines.</para></listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guilabel>Code Folding</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Show folding markers (if available)
++</guilabel></term>
++<listitem><para>If this option is checked, the current view will display marks
++for code folding, if code folding is available.</para></listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guilabel>Borders</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Show icon border
++</guilabel></term>
++<listitem><para>If this is checked, you will see an icon border on the left
++hand side. The icon border shows bookmark signs for instance.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Show line numbers
++</guilabel></term>
++<listitem><para>If this is checked, you will see line numbers on the left
++hand side.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Show scrollbar marks
++</guilabel></term>
++<listitem><para>If this option is checked the current view
++will show marks on the vertical scrollbar. These marks will
++for instance show bookmarks.</para></listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guilabel>Sort Bookmarks Menu
++</guilabel></term>
++<listitem><para>
++<variablelist>
++<varlistentry>
++<term><guilabel>By position
++</guilabel></term>
++<listitem><para>The bookmarks will be ordered by the line
++numbers they are placed at.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>By creation
++</guilabel></term>
++<listitem><para>Each new bookmark will be added to the bottom,
++independently from where it is placed in the document.</para></listitem>
++</varlistentry>
++</variablelist>
++</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guilabel>Show identation lines
++</guilabel></term>
++<listitem><para>If this is checked, the editor wil display
++vertical lines to help identifying indent lines.</para></listitem>
++</varlistentry>
++</variablelist>
++</sect1>
++
+ <sect1 id="prefcolors">
++<title>Fonts &amp; Colors</title>
++
++<para>This section of the dialog lets you configure all fonts and colors in
++any color scheme you have, as well creating new schemes or deleting existing
++ones. Each scheme has settings for colors, fonts and normal and highlight text
++styles.
++</para>
++
++<para>&kwrite; will preselect the currently active scheme for you, if you want to
++work on a different scheme start by selecting that from the
++<guilabel>Schema</guilabel> combobox.</para>
++
++<sect2 id="prefcolors-colors">
+ <title>Colors</title>
+-  
+-<para>This section provides access to <link  
+-linkend="pref-color-settings">two different color settings</link>,  
+-described below.  Each of these settings may be changed by clicking on its  
+-corresponding button.  These are special wide buttons that are the color of  
+-the current setting.  Clicking on one of the buttons calls a special color  
+-dialog box used to change the setting.</para>  
+-  
+-<para>The color dialog box provides a convenient and graphical way to
+-select a color.  In the upper left of the box is a rectangular display of a  
+-spectrum of colors. To the immediate right of this, is vertical bar  
+-displaying a range of intensity from the most dark at the bottom to the  
+-most light at the top.  The user may select and adjust a color by clicking  
+-in these two boxes. Clicking in the rectangular display selects a  
+-particular mix of red, green, and blue colors and in the vertical bar  
+-selects a level of intensity (value).  The various color attributes are displayed  
+-in numerical form in small text boxes located directly below the spectral  
+-rectangle and the user can see them change as the color is adjusted.  These  
+-attributes include the mix of the basic color components (red, green, and  
+-blue) as well as hue and saturation levels.  Alternatively the user can  
+-enter figures directly in these boxes.  There is also a square at the  
+-bottom center of the dialog box which displays the color which is under  
+-consideration at any time.  To the right of this display is another text  
+-box labeled <guilabel>HTML:</guilabel> This shows the user the color code  
+-that would be used to specify the particular displayed color in  
+-<acronym>HTML</acronym> code which is widely used for web pages.</para>  
+-  
+-<para>In addition to the above, the color dialog allows the capture of any  
+-color currently displayed on the desktop or in another program.  Clicking  
+-on the button with the dropper icon (located on the right side of the  
+-dialog box,) changes the shape of the mouse cursor to a set of crosshairs.  
+-Clicking again will pick up the color attributes of whatever color is  
+-displayed under the cross hairs.</para>  
+-  
+-<para>Furthermore the user has the option of adding any color to a
+-personal palette of <quote>Custom Colors</quote> by clicking on the wide
+-button labeled <guibutton>Add to Custom Colors</guibutton> (which is
+-located directly above the display square.)  This adds the current color
+-to the custom color palette.  This palette and any other available
+-palettes can be displayed using the drop down selection box located
+-directly above the palette display at the top right of the dialog box.
+-Besides the custom colors, the user can access a number of pre-prepared
+-palettes.</para>
+-  
+-<variablelist>  
+-  
+-<varlistentry id="pref-color-settings">  
+-<term><guilabel>Background</guilabel></term>  
+-<listitem><para>Here the user can specify a color for the general
+-background of &kwrite;.</para></listitem>   
+-</varlistentry>  
+ 
+-<varlistentry>  
+-<term><guilabel>Selected</guilabel></term>  
+-<listitem><para>This allows the user to select a color to be used for indicating  
+-selected (or highlighted) portions of the document.</para></listitem> </varlistentry>  
+-</variablelist>  
+-</sect1>  
++<variablelist>
++<varlistentry id="prefcolors-colors-text-background">
++<term><guilabel>Text Area Background</guilabel></term>
++<listitem>
+ 
+-<sect1 id="pref-fonts">
++<variablelist>
++
++<varlistentry id="pref-colors-normal-text">
++<term><guilabel>Normal text</guilabel></term>
++<listitem><para>This is the default background for the editor area, it will be
++the dominant color on the editor area.</para></listitem>
++</varlistentry>
++
++<varlistentry id="pref-colors-selected-text">
++<term><guilabel>Selected Text</guilabel></term>
++<listitem><para>This is the background for selected text. The default is
++the global selection color, as set in your &kde; color preferences.
++</para></listitem>
++</varlistentry>
++
++<varlistentry id="pref-colors-current-line">
++<term><guilabel>Current Line</guilabel></term>
++<listitem><para>Set the color for the current line. Setting this a bit different
++from the Normal text background helps to keep focus on the current line.
++</para></listitem>
++</varlistentry>
++
++<varlistentry id="pref-colors-marks">
++<term><guilabel>Bookmark</guilabel></term>
++<listitem><para>This combo lets you set overlay colors for various mark types.
++The color is mixed into the background color of a marked line, so that a line
++with more marks or a marked line that is current has a background that is a mix
++of more colors. The mark colors are also used if you enable display of scrollbar
++marks.</para></listitem>
++</varlistentry>
++
++</variablelist>
++</listitem>
++</varlistentry>
++
++<varlistentry id="prefcolors-colors-other-elements">
++<term><guilabel>Other Elements</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Left Border Background</guilabel></term>
++<listitem><para>This color is used for the marks, line numbers and folding
++marker borders in the left side of the editor view when they are displayed.
++</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Line Numbers</guilabel></term>
++<listitem><para>This color is used to draw the line numbers on the left side of
++the view when displayed.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Bracket Highlight</guilabel></term>
++<listitem><para>This color is used to draw the background of matching brackets.
++</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Word Wrap Markers</guilabel></term>
++<listitem><para>This color is used to draw a pattern to the left of dynamically
++wrapped lines when those are aligned vertically, as well as for the static word
++wrap marker.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Tab Markers</guilabel></term>
++<listitem><para>This color is used to draw white space indicators when enabled.
++</para></listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
++
++</variablelist>
++</sect2>
++
++<sect2 id="prefcolors-fonts">
+ <title>Fonts</title>
+-
+ <para>
+-Here you can choose the default font for &kwrite;.  You can choose from
+-any font available on your system, and set a default size and encoding.
+-A sample text displays at the bottom of the dialog, so you can see the
+-effect of your choices.
++Here you can choose the font for the schema.  You can choose from
++any font available on your system, and set a default size. A sample text
++displays at the bottom of the dialog, so you can see the effect of your choices.
+ </para>
++</sect2>
+ 
++<sect2 id="prefcolors-normal-text-styles">
++<title>Normal Text Styles</title>
++<para>The normal text styles are inherited by the highlight text styles,
++allowing the editor to present text in a very consistent way, for example comment
++text is using the same style in allmost all of the text formats that kate can
++highlight.</para>
++<para>The name in the list of styles is using the style configured for
++the item, providing you with an immediate preview when configuring a style.
++</para>
++<para>Each style lets you select common attributes as well as foreground
++and background colors. To unset a background color, rightclick to use the
++context menu.</para>
++</sect2>
++
++<sect2 id="prefcolors-highlighting-text-styles">
++<title>Highlighting Text Styles</title>
++<para>Here you can edit the text styles used by a specific highlight definition.
++The editor preselects the highlight used by your current document. To work on a
++different highlight, select one in the <guilabel>Highlight</guilabel> combobox
++above the style list.
++</para>
++<para>The name in the list of styles is using the style configured for
++the item, providing you with an immediate preview when configuring a style.
++</para>
++<para>Each style lets you select common attributes as well as foreground
++and background colors. To unset a background color, rightclick to use the
++context menu. In addition you can see if a style is equal to the default style
++used for the item, and set it to that if not.</para>
++<para>You will notice that many highlights contain other highlights represented
++by groups in the style list. For example most highlights import the Alert
++highlight, and many source code formats imports the Doxygen highlight. Editing
++colors in those groups only affects the styles when used in the edited highlight
++format.
++</para>
++</sect2>
++
+ </sect1>
+-  
+-<sect1 id="pref-indent">  
+-<title>Indent</title>  
+-<variablelist>  
+-  
+-<varlistentry>  
+-<term><guilabel>Auto Indent</guilabel></term> <listitem><para>This causes  
+-new lines to begin with the same indentation level as the previous  
+-line.</para></listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
+-<term><guilabel>Indent With Spaces</guilabel></term> <listitem><para>This  
+-replaces tabs with the number of spaces selected in the Tab Width window in  
+-the <link linkend="pref-edit">Edit</link> section of the preferences  
+-dialog.</para></listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
+-<term><guilabel>Backspace Key Indents</guilabel></term>  
+-<listitem><para>This allows the  
+-<keycombo action="simul"><keycap>backspace</keycap></keycombo> key to be used to  
+-indent.</para></listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
+-<term><guilabel>Tab Key Indents</guilabel></term> <listitem><para>This  
+-allows the <keycombo action="simul"><keycap>tab</keycap></keycombo> key to be used to  
+-indent.</para></listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
+-<term><guilabel>Keep Extra Spaces</guilabel></term>  
+-<listitem><para>Indentations of more than the selected number of spaces  
+-will not be shortened.</para></listitem>  
+-</varlistentry>  
+-  
+-</variablelist>  
+-</sect1>  
+ 
+-<!-- 
+-2004-08-27
+-Out of date - getting it out of the translators' way
+-- Phil
+-<sect1 id="pref-select">  
+-<title>Select</title>  
+-<variablelist>  
+-  
+-<varlistentry>  
+-<term><guilabel>Persistent Selections</guilabel></term>  
+-<listitem><para>This prevents key input or cursor movement by way of the  
+-arrow keys from causing the elimination of text  
+-selection. </para><note><para>(Note: If the Overwrite Selections option is  
+-activated then any typed character input or paste operation will replace  
+-the selected text.)</para></note></listitem> </varlistentry>  
+-  
+-<varlistentry> <term><guilabel>Overwrite Selections</guilabel></term>  
+-<listitem><para>Any keyed character input or paste operation will replace  
+-the selected text.  </para></listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
+-<term><guilabel>Mouse Autocopy</guilabel></term> <listitem><para>Any text  
+-selected with the mouse will be automatically copied to the  
+-clipboard.</para></listitem>  
+-</varlistentry>  
++<sect1 id="pref-cursor-selection">
++<title>Cursor &amp; Selection</title>
+ 
+-<varlistentry>  
+-<term><guilabel>X11-like Single Selection</guilabel></term>  
+-<listitem><para>Not implemented yet.</para></listitem>  
+-</varlistentry>  
++<variablelist>
+ 
+-  
+-<varlistentry>  
+-<term>Toggle Old</term> <listitem><para>Not yet implemented</para></listitem>  
+-</varlistentry>  
+-  
+-</variablelist>  
+-</sect1>  
+-  -->
+-<sect1 id="pref-edit">  
+-<title>Edit</title>  
+-<variablelist>  
+-<varlistentry>  
+-<term id="pref-word-wrap"><guilabel>Static Word Wrap</guilabel></term>  
+-<listitem><para>Word wrap is a feature that causes the editor to
+-automatically start a new line of text and move (wrap) the cursor to the
+-beginning of that new line.  &kwrite; will automatically start a new line of text
+-when  the current line reaches the length specified by the <link
+-linkend="pref-wrap-words-at">Wrap Words At:</link>  
+-option.</para></listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
+-<term id="pref-wrap-words-at"><guilabel>Wrap Words  
+-At:</guilabel></term><listitem><para>If the <link  
+-linkend="pref-word-wrap">Word Wrap</link> option is selected this entry  
+-determines the length (in characters) at which the editor will
+-automatically start a new line.</para></listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
+-<term id="pref-replace-tabs-by-spaces"><guilabel>Replace Tabs By  
+-Spaces</guilabel></term> <listitem><para>&kwrite; will replace any tabs  
+-with the number of spaces indicated in the <link  
+-linkend="pref-tab-width">Tab Width:</link> entry.</para></listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
+-<term id="pref-tab-width">Tab Width</term> <listitem><para>If the <link  
+-linkend="pref-word-wrap"><guilabel>Replace Tabs By Spaces</guilabel></link>  
+-option is selected this entry determines the number of spaces with which
+-the editor will automatically replace tabs.</para></listitem>  
+-</varlistentry>  
+-  
+-<varlistentry>  
+-<term><guilabel>Remove Trailing Spaces</guilabel></term>  
+-<listitem><para>&kwrite; will automatically eliminate extra spaces at the  
+-ends of lines of text.</para></listitem> </varlistentry>  
+-  
+-<varlistentry>  
+-<term><guilabel>Auto Brackets</guilabel></term> <listitem><para>When the
+-user types a left bracket ([, (, or {) &kwrite; automatically
+-enters the right bracket (}, ), or ]) to the right of the
+-cursor.</para></listitem>
++<varlistentry>
++<term><guilabel>Text Cursor Movement</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Smart home</guilabel></term>
++<listitem>
++<para>When selected, pressing the home key will cause the cursor to
++skip white space and go to the start of a line's text.</para>
++</listitem>
+ </varlistentry>
++<varlistentry>
++<term><guilabel>Wrap cursor</guilabel></term>
++<listitem>
++<para>When on, moving the insertion cursor using the <emphasis
++role="bold">Left</emphasis> and <emphasis role="bold">Right</emphasis> keys will
++go on to previous/next line at beginning/end of the line, similar to most
++editors.</para><para>When off, the insertion cursor cannot be moved left of the
++line start, but it can be moved off the line end, which can be very handy for
++programmers. When this option is chosen, moving the cursor with the arrow keys
++off the end of a line (to the right) causes it to jump down to the beginning of
++the next line. Likewise when the cursor is moved past the beginning of a line
++(to the left) it jumps up to the end of the preceding line. When this option is
++not selected, moving the cursor right past the end of a line merely causes it to
++continue horizontally in the same line and trying to move it left past the
++beginning does nothing.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Page Up/Page Down moves cursor</guilabel></term>
++<listitem>
++<para>This option changes the behavior of the cursor when the user presses
++the <keycap>Page Up</keycap> or <keycap>Page Down</keycap> key. If unselected
++the text cursor will maintain its relative position within the visible text in
++&kwrite; as new text becomes visible as a result of the operation.  So if the
++cursor is in the middle of the visible text when the operation occurs it will
++remain there (except when one reaches the beginning or end.)  With this option
++selected, the first key press will cause the cursor to move to either the top or
++bottom of the visible text as a new page of text is displayed.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Autocenter cursor (lines):</guilabel></term>
++<listitem>
++<para>Sets the number of lines to maintain visible above and below the cursor
++when possible.</para>
++</listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
+-<!-- Outdated
+ <varlistentry>
+-<term id="group-undos"><guilabel>Group Undos</guilabel></term>
+-<listitem><para>Groups of similar actions are to be considered a single
+-<link linkend="undo">Undo</link> step by &kwrite;. In other words, a series
+-of regular character keystrokes (words or expressions) would be considered
+-one step and therefore be removed by a single undo operation.  If the
+-series of character entries were interrupted by a non-character entry
+-operation (such as a backspace), invoking undo would only remove the
+-entries made since that operation. The next undo would then reverse that
+-operation and so on.</para>
+-<para> When this option is not selected &kwrite; considers
+-each keystroke to be a single step.  So if the user (with this option
+-active) were to type several words or even sentences without having to make
+-corrections or cut or paste or some other non-character entry operation
+-then a click of the undo button would eliminate all that had been typed
+-since the last non-entry operation.  A second click would eliminate that
+-operation and a third any operation or series of entries that occurred
+-before the operation and so on.  When not selected three clicks of the undo
+-button would only remove the last three letters typed, or the last three
+-operations.</para></listitem>  
+-</varlistentry>  
+--->  
+-<varlistentry> <term><guilabel>Show Tabs</guilabel></term>  
+-<listitem><para>The editor will display a symbol to indicate the presence  
+-of a tab in the text.</para></listitem>  
+-</varlistentry>  
+-<!--
++<term><guilabel>Selection Mode</guilabel></term>
++<listitem>
++<variablelist>
+ <varlistentry>
+-<term><guilabel>Smart Home</guilabel></term>
+-<listitem><para>Not yet implemented</para></listitem>
++<term><guilabel>Normal</guilabel></term>
++<listitem>
++<para>Selections will be overwritten by typed text and will be lost on
++cursor movement.</para>
++</listitem>
+ </varlistentry>
+--->
+ <varlistentry>
+-<term><guilabel>Page Up/Down Moves Cursor</guilabel></term>
+-<listitem><para>This option changes the behavior of the cursor when
+-the user presses the <keycap>Page Up</keycap> or <keycap>Page Down</keycap> key. If
+-unselected the text cursor will maintain its relative position within the visible
+-text in &kwrite; as new text becomes visible as a result of the operation.  So if
+-the cursor is in the middle of the visible text when the operation occurs it will
+-remain there (except when one reaches the beginning or end.)  With this
+-option selected, the first key press will cause the cursor to move to either the top
+-or bottom of the visible text as a new page of text is displayed.
+-</para></listitem>
++<term><guilabel>Persistent</guilabel></term>
++<listitem>
++<para>Selections will stay even after cursor movement and typing.</para>
++</listitem>
+ </varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
++</variablelist>
++</sect1>
++
++<sect1 id="pref-edit">
++<title>Editing</title>
++<variablelist>
++
+ <varlistentry>
+-<term>Wrap Cursor</term> 
+-<listitem><para>When this option is chosen, moving
+-the cursor with the arrow keys off the end of a line (to the right) causes
+-it to jump down to the beginning of the next line.  Likewise when the
+-cursor is moved past the beginning of a line (to the left) it jumps up to
+-the end of the preceding line. When this option is not selected, moving the
+-cursor right past the end of a line merely causes it to continue
+-horizontally in the same line and trying to move it left past the beginning
+-does nothing.</para>
+-<para>
+-When this option is chosen, clicking with the mouse past the end of a
+-line of text will place the insert cursor <emphasis>at the end of the
+-text</emphasis>, and not in the place you clicked.  This avoids
+-accidentally adding an empty space in the middle of text, and is the
+-default behavior of most editors.
+-</para>
++<term><guilabel>Tabulators</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Insert spaces instead of tabulators</guilabel></term>
++<listitem>
++<para>When this is enabled the editor will insert a calculated number of spaces
++according to the position in the text and the <option>tab-width</option> setting
++when you press the <keycap>TAB</keycap> key.</para>
+ </listitem>
+ </varlistentry>
++<varlistentry>
++<term><guilabel>Show tabulators</guilabel></term>
++<listitem>
++<para>When this is enabled &kwrite; will display a small dot as a visual
++representation of tabulator characters.</para>
++<note><para>This also causes dots to be drawn to indicate trailing white space.
++This will be fixed in a future version of &kwrite;</para></note>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term id="pref-tab-width">Tab Width</term> <listitem><para>If the
++<link  linkend="pref-word-wrap"><guilabel>Replace Tabs By
++Spaces</guilabel></link>
++option is selected this entry determines the number of
++spaces with which the editor will automatically replace
++tabs.</para></listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
+ <varlistentry>
+-<term><link linkend="undo">Undo</link> steps:</term> <listitem><para>Here
+-the user may specify the number of steps &kwrite; will retain in memory for
+-purposes of undoing entries and actions.  This means that the higher the
+-number of steps set the more memory &kwrite; will use for this.  Setting
+-this entry to 10 would mean that the user would be be able reverse the last
+-ten operations, <abbrev>i.e.</abbrev> click the <guibutton>undo</guibutton>
++<term id="pref-word-wrap"><guilabel>Static Word Wrap</guilabel></term>
++<listitem><para>
++Word wrap is a feature that causes the editor to automatically start a new line
++of text and move (wrap) the cursor to the beginning of that new line.  &kwrite;
++will automatically start a new line of text when  the current line reaches the
++length specified by the <link linkend="pref-wrap-words-at">Wrap Words
++At:</link> option.</para>
++<variablelist>
++<varlistentry>
++<term><guilabel>Enable static word wrap</guilabel></term>
++<listitem>
++<para>Turns static word wrap on or off.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Show static word wrap markers
++(if applicable)</guilabel></term>
++<listitem>
++<para>If this option is checked, a vertical line will be drawn at the word wrap
++column as defined in the <menuchoice> <guimenu>Settings</guimenu>
++<guimenuitem>Configure Editor...</guimenuitem></menuchoice> in the Editing tab.
++Please note that the word wrap marker is only drawn if you use a fixed pitch
++font.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term id="pref-wrap-words-at"><guilabel>Wrap words at:</guilabel></term>
++<listitem>
++<para>If the <link linkend="pref-word-wrap">Word Wrap</link> option is selected
++this entry  determines the length (in characters) at which the editor will
++automatically start a new line.</para>
++</listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guilabel>Remove Trailing Spaces</guilabel></term>
++<listitem><para>&kwrite; will automatically eliminate extra spaces
++at the ends of lines of text.</para></listitem> </varlistentry>
++
++<varlistentry>
++<term><guilabel>Auto Brackets</guilabel></term> <listitem><para>When
++the user types a left bracket ([, (, or {) &kwrite; automatically enters the
++right bracket (}, ), or ]) to the right of the cursor.</para></listitem>
++</varlistentry>
++
++<varlistentry> <term>Maximum <link linkend="undo">undo</link> steps:</term>
++<listitem><para>Here the user may specify the number of steps &kwrite; will
++retain in memory for purposes of undoing entries and actions. This means that
++the higher the number of steps set the more memory &kwrite; will use for this.
++Setting  this entry to 10 would mean that the user would be be able reverse the
++last ten operations, <abbrev>i.e.</abbrev> click the <guibutton>undo</guibutton>
+ button 10 times and obtain results.</para></listitem> </varlistentry>
+ 
+-<!-- Outdated
++<varlistentry> <term>Smart search text from:</term>
++<listitem><para>This determines where &kwrite; will get the search
++text from (this will be automatically entered into the Find Text
++dialog):
++<itemizedlist>
++<listitem><para><emphasis role="bold">Nowhere:</emphasis> Don't guess the search
++text.</para></listitem>
++<listitem><para><emphasis role="bold">Selection Only:</emphasis> Use
++    the current text selection, if available. </para></listitem>
++<listitem><para><emphasis role="bold">Selection, then Current Word:</emphasis>
++Use the current selection if available, otherwise use the current word.
++</para></listitem>
++<listitem><para><emphasis role="bold">Current Word
++Only:</emphasis> Use the word that    the cursor is currently resting on, if
++available. </para></listitem>
++<listitem><para><emphasis role="bold">Current Word, then Selection:</emphasis>
++Use the current word if    available, otherwise use the current selection.
++</para></listitem>
++</itemizedlist>
++Note that, in all the above modes, if a
++search string has not been or cannot be determined, then the Find Text Dialog
++will fall back to the last search text.
++</para></listitem>
++</varlistentry>
++<!--<varlistentry>
++<term id="pref-replace-tabs-by-spaces"><guilabel>Replace Tabs By
++Spaces</guilabel></term> <listitem><para>&kwrite; will replace any tabs  with
++the number of spaces indicated in the <link  linkend="pref-tab-width">Tab
++Width:</link> entry.</para></listitem>  </varlistentry>
++
++<varlistentry> <term><guilabel>Show Tabs</guilabel></term>
++<listitem><para>The editor will display a symbol to indicate
++the presence
++of a tab in the text.</para></listitem>
++</varlistentry>  -->
++</variablelist>
++</sect1>
++
++<sect1 id="pref-indent">
++<title>Indentation</title>
++<variablelist>
+ <varlistentry>
+-<term>Encoding</term>
++<term><guilabel>Automatic indentation</guilabel></term>
+ <listitem>
+-<para>
+-This sets the character encoding for your file.
+-</para>
++<variablelist>
++<varlistentry>
++<term><guilabel>Indentation mode:</guilabel></term>
++<listitem>
++<para>Select the automatic indentation mode you want to use as default. It is
++strongly recommended to use <userinput>None</userinput> or
++<userinput>Normal</userinput>here, and use filetype configurations to set other
++indentation modes for text formats like C/C++ code or &XML;.</para>
+ </listitem>
+ </varlistentry>
+--->
++<varlistentry>
++<term><guilabel>Insert leading Doxygen "*" when typing</guilabel></term>
++<listitem>
++<para>Automatically insert a leading "*" while typing within a doxygen
++style comment. This setting is only enabled when applicable.</para>
++</listitem>
++</varlistentry>
+ </variablelist>
+-</sect1>
++</listitem>
++</varlistentry>
+ 
+-<sect1 id="prefspellchecker">
+-<title>Spelling</title> <para>A spell checker is a program designed to
+-help the user catch and correct any spelling errors.  This section of the
+-preferences dialog allows certain important settings to be adjusted in this
+-regard.</para>
++<varlistentry>
++<term><guilabel>Indentation with Spaces</guilabel></term>
++<listitem>
+ <variablelist>
++<varlistentry>
++<term><guilabel>Use spaces instead of tabs to indent</guilabel></term>
++<listitem>
++<para>This  replaces tabs with the number of spaces set in <guilabel>Number of
++spaces:</guilabel> below.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Emacs style mixed mode</guilabel></term>
++<listitem>
++<para>Use a mix of tabs and space characters for indentation.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Number of spaces:</guilabel></term>
++<listitem>
++<para>Set the number of spaces you want to use for indentation when you
++check <guilabel>Use spaces instead of tabs to indent</guilabel>
++above.</para>
++</listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
+ <varlistentry>
+-<term><guilabel>Create root/affix combinations not in
+-dictionary</guilabel></term> <listitem><para>Selecting this option allows
+-the spell checker to register as 'correct' combinations of root words with
+-suffixes or prefixes even if the particular combination is not listed in
+-its dictionary data base of words.</para></listitem>
++<term><guilabel>Keep Indent Profile</guilabel></term>
++<listitem><para>When this is enabled, the editor will not unindent lines in a
++selection further when the line with the least indentation becomes unindented.
++If you sometimes unindent blocks of indented code, this may be helpful.
++</para></listitem>
++</varlistentry>
+ 
++<varlistentry>
++<term><guilabel>Keep Extra Spaces</guilabel></term>
++<listitem><para>Indentations of more than the selected number of spaces
++will not be shortened.</para></listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guilabel>Consider run-together words as spelling
+-errors</guilabel></term> <listitem><para>Selecting this will cause the
+-spell checker to register as 'misspelled' two or more correctly spelled
+-words that are 'run-together', <abbrev>i.e.</abbrev>, that do not have spaces
+-separating them.</para></listitem>
++<term><guilabel>Keys to use</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Tab key indents</guilabel></term>
++<listitem>
++<para>This  allows the <keycombo
++action="simul"><keycap>tab</keycap></keycombo> key to be used to indent.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Backspace key indent</guilabel></term>
++<listitem>
++<para>This allows the <keycombo
++action="simul"><keycap>backspace</keycap></keycombo> key to be used to
++indent.</para>
++</listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
++<varlistentry>
++<term><guilabel>Tab Key Mode if Nothing Selected</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Insert indent characters</guilabel></term>
++<listitem>
++<para>This allows the <keycombo
++action="simul"><keycap>Tab</keycap></keycombo> key insert indent
++characters.</para>
++</listitem>
+ </varlistentry>
++<varlistentry>
++<term><guilabel>Insert tab character</guilabel></term>
++<listitem>
++<para>This allows the <keycombo
++action="simul"><keycap>Tab</keycap></keycombo> key insert a tab.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Indent current line</guilabel></term>
++<listitem>
++<para>This allows the <keycombo
++action="simul"><keycap>Tab</keycap></keycombo> key indent the current
++line.</para>
++</listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
++<!--<varlistentry>
++<term><guilabel>Auto Indent</guilabel></term> <listitem><para>This causes
++new lines to begin with the same indentation level as the previous
++line.</para></listitem>
++</varlistentry>  -->
++</variablelist>
++</sect1>
++
++<sect1 id="pref-open-save">
++<title>Open &amp; Save</title>
++
++<variablelist>
++
+ <varlistentry>
+-<term><guilabel>Dictionary:</guilabel></term> <listitem><para>Depending on
+-the user's installation one or more different language spelling
+-dictionaries may be available.  This drop down box allows the user to
+-choose which language the spell checker should use.</para></listitem>
+-  
+-</varlistentry>  
+-  
+-<varlistentry>  
+-<term><guilabel>Encoding:</guilabel></term> <listitem><para>There are  
+-different coding systems used to associate particular codes with particular  
+-characters and symbols.  If the user knows which code he or she is using  
+-this drop down box allows this code to be specified so that the spell
+-checker can do its job correctly. </para></listitem> </varlistentry>
++<term><guilabel>File Format</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Encoding:</guilabel></term>
++<listitem>
++<para>This sets the default character encoding for your files.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>End of line:</guilabel></term>
++<listitem>
++<para>Choose your prefered end of line mode for your active
++document. You have the choice between &UNIX;, DOS/&Windows; or Macintosh.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Automatic end of line detection</guilabel></term>
++<listitem>
++<para>Check this if you want the editor to autodetect the end of line
++type. The first found end of line type will be used for the whole file.</para>
++</listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
+ <varlistentry>
+-<term><guilabel>Client:</guilabel></term> <listitem><para>Since &kwrite;
+-does not contain its own spell checker, an external one must be chosen.
+-This is where the user may specify which spell check program to
+-use.</para></listitem> </varlistentry>
++<term><guilabel>Memory Usage</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Maximum loaded blocks per file:</guilabel></term>
++<listitem>
++<para>The editor will load given number of blocks (of around 2048 lines) of
++text into memory;  if the filesize is bigger than this the other blocks
++are swapped to disk and loaded transparently as-needed.</para>
++<para>This can cause little delays while navigating in the document; a
++larger block count increases the editing speed at the cost of memory.
++</para><para>For normal usage, just choose the highest possible block count:
++limit it only if you have problems with the memory usage.</para>
++</listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
+ 
++<varlistentry>
++<term><guilabel>Automatic Cleanups on Load/Save</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Remove trailing spaces</guilabel></term>
++<listitem>
++<para>The editor will automatically eliminate extra spaces at the ends of lines
++of text while loading/saving the file.</para>
++</listitem>
++</varlistentry>
+ </variablelist>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guilabel>Folder Config File</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Search depth for config file:</guilabel></term>
++<listitem>
++<para>The editor will search the given number of folder levels upwards
++for &kwrite; config file and load the settings line from it.</para>
++</listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guilabel>Backup on Save</guilabel></term>
++<listitem><para>Backing up on save will cause &kwrite; to copy the disk file to
++&lt;prefix&gt;&lt;filename&gt;&lt;suffix&gt;' before saving changes.
++The suffix defaults to <emphasis role="bold">~</emphasis> and prefix is empty by
++default. </para>
++<variablelist>
++<varlistentry>
++<term><guilabel>Local files</guilabel></term>
++<listitem>
++<para>Check this if you want backups of local files when
++saving.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Remote files</guilabel></term>
++<listitem>
++<para>Check this if you want backups of remote files when saving.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Prefix</guilabel></term>
++<listitem>
++<para>Enter the prefix to prepend to the backup file names.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Suffix</guilabel></term>
++<listitem>
++<para>Enter the suffix to add to the backup file names.</para>
++</listitem>
++</varlistentry>
++
++</variablelist>
++</listitem>
++</varlistentry>
++
++</variablelist>
+ </sect1>
+-</chapter>
+ 
+-<!--
+-2004-08-27 
+-Whole chapter is out of date, moving out of translators' way
+--Phil
+-<chapter id="pref-highlighting">
++<sect1 id="pref-highlighting">
+ <title>Highlighting</title>
++<para>This group of options is used to customize the highlighting styles for
++each programming language type. Any changes you made in other areas of this
++dialog apply only to this type.</para>
+ 
+-<para>The <guilabel>Configure Highlighting</guilabel> dialog consists of two
+-pages, <guilabel>Defaults</guilabel> and <guilabel>Highlighting
+-Modes</guilabel>.  The user can select which page to view by clicking on the
+-appropriate tab at the top of the dialog</para>
++<variablelist>
++<varlistentry>
++<term><guilabel>Highlight:</guilabel></term>
++<listitem><para>This is used to choose the language type to
++configure.</para></listitem>
++</varlistentry>
+ 
++<varlistentry>
++<term><guilabel>Informations</guilabel></term>
++<listitem>
++<para>
++View the properties of the chosen language highlighting rules:
++author name and license.
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guilabel>Properties</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>File extensions:</guilabel></term>
++<listitem><para>This is the list of file extensions used to determine which
++files to highlight using the current syntax highlight mode.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>MIME types:</guilabel></term>
++<listitem><para>Clicking the wizard button will display a dialog with a list of
++all available mime types to choose from.</para><para>The <emphasis
++role="bold">File Extensions</emphasis> entry will automatically be edited as
++well.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Priority:</guilabel></term>
++<listitem><para>Set the priority of the highlight rule.</para></listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guibutton>Download...</guibutton></term>
++<listitem>
++<para>
++Click this button to download new or updated syntax highlight descriptions
++from the &kate; website.
++</para>
++</listitem>
++</varlistentry>
++
++</variablelist>
++<!-- obsolete annma 24 December 2005
++<para>The <guilabel>Configure
++Highlighting</guilabel> dialog consists of
++two pages, <guilabel>Defaults</guilabel> and <guilabel>Highlighting
++Modes</guilabel>. The user can select which page to view by
++clicking on the appropriate tab at the top of the dialog</para>
++
+ <para>Items available on the <guilabel>Defaults</guilabel> page are as
+ follows:</para>
+ 
+@@ -1552,15 +2613,15 @@
+ <term><guilabel>Default Item Styles</guilabel></term>
+ <listitem>
+ <para>
+-The user can configure the default appearance for particular items.
+-This would allow a programmer to more easily identify different items
+-(types of entries) in his or her code.
++The user can configure the default appearance for
++particular items. This would allow a programmer to more easily identify
++different items (types of entries) in his or her code.
+ </para>
+ 
+ <variablelist>
+ <varlistentry>
+ <term><guilabel>Item</guilabel></term>
+-<listitem><para>This drop down list offers a variety of items that the user
++<listitem><para>This drop down box offers a variety of items that the user
+ might want to highlight.  They include <guilabel>Normal</guilabel> for
+ text does not fit in any of the other categories, <guilabel>Comment</guilabel>,
+ <guilabel>String</guilabel>, <guilabel>Keyword</guilabel> and many more.  Not
+@@ -1570,122 +2631,233 @@
+ </varlistentry>
+ <varlistentry>
+ <term><guilabel>Normal</guilabel></term>
+-<listitem><para>This allows the user to choose the item's normal
+-(unselected) color.  This is done by means of a color selection
+-dialog box, a further explanation of which may be found in the <link
+-linkend="prefcolors">Colors</link> section of <link
+-linkend="pref-dialog">Configure KWrite</link>.</para>
+-
++<listitem><para>This allows the user to choose the
++item's normal (unselected) color.  This is done by means
++of a color selection dialog box, a further explanation of which
++may be found in the <link linkend="prefcolors">Colors</link> section of <link
++linkend="pref-dialog">Configure &kwrite;</link>.</para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+ <term><guilabel>Bold</guilabel></term>
+-<listitem><para>This option determines whether or not the item should be displayed in
+-bold text.</para></listitem>
++<listitem><para>This option determines whether or
++not the item should be displayed in bold text.</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><guilabel>Italic</guilabel></term>
+-<listitem><para>This option determines whether or not the item should be displayed in italic
+-text.</para></listitem>
++<listitem><para>This option determines whether or
++not the item should be displayed in italic text.</para></listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+ <term><guilabel>Selected</guilabel></term>
+-<listitem><para>This allows the user to choose the item's color
+-when selected.  This is done by means of a color selection
+-dialog box, a further explanation of which may be found in the <link
+-linkend="prefcolors">Colors</link> section of <link
+-linkend="pref-dialog">Configure KWrite</link>.</para>
+-
++<listitem><para>This allows the user to choose the
++item's color when selected.  This is done by means of a
++color selection dialog box, a further explanation of which
++may be found in the <link linkend="prefcolors">Colors</link> section of <link
++linkend="pref-dialog">Configure &kwrite;</link>.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </listitem>
+ </varlistentry>
+-</variablelist>  
+-  
+-<para>Items on the <guilabel>Highlight Modes</guilabel> tab allow the user to define
+-more specific highlighting depending on the language style.</para>
+-  
++</variablelist>
++
++<para>Items on the <guilabel>Highlight Modes</guilabel> tab allow the
++user to define more specific highlighting depending on the language
++style.</para>
++
+ <para>One need not set every available option, items not configured
+-specifically will use the default configuration specified on the previous  
+-(<guilabel>Defaults</guilabel> tab.</para>  
+-  
+-<variablelist>  
+-<varlistentry>  
+-<term><guilabel>Config Select</guilabel></term>  
+-<listitem><para>This group of options is used to customize the highlighting styles
+-for each programming language type.  Any changes you made in
+-other areas of this dialog apply only to this type.</para>
++specifically will use the default configuration specified on the
++previous <guilabel>Defaults</guilabel> tab.</para>
+ 
+ <variablelist>
+ <varlistentry>
++<term><guilabel>Config Select</guilabel></term>
++<listitem><para>This group of options is used to customize the
++highlighting styles for each programming language type.  Any changes you
++made in other areas of this dialog apply only to this
++type.</para>
++
++<variablelist>
++<varlistentry>
+ <term><guilabel>Highlight</guilabel></term>
+-<listitem><para>This is used to choose the language type to
+-configure</para></listitem>  
++<listitem><para>This is used to choose the language
++type to  configure</para></listitem>
+ </varlistentry>
+-<varlistentry>  
+-<term><guilabel>Item</guilabel></term>  
+-<listitem><para>This is to choose the syntax item to configure.  Remember
+-this  only configures <emphasis>this</emphasis> item for <emphasis>this</emphasis>
++<varlistentry>
++<term><guilabel>Item</guilabel></term>
++<listitem><para>This is to choose the syntax item to
++configure.  Remember this  only configures
++<emphasis>this</emphasis> item for
++<emphasis>this</emphasis>
+ language.</para></listitem>
+ </varlistentry>
+ </variablelist>
+ 
+-<para>As an example, if the user wished to configure the appearance of
+-<quote>comments</quote> while writing C++, she or he could choose C++ in the
+-<guilabel>Highlight</guilabel> drop down list, and then choose Comment in the
+-<guilabel>Item</guilabel> drop down list. To have <quote>comments</quote> look
+-the same across all languages, the user would need to configure this in the
+-<guilabel>Defaults</guilabel> page of this dialog box while leaving
+-<quote>comments</quote> unconfigured within the more specific
+-<guilabel>Highlight Modes</guilabel> page.</para> </listitem> </varlistentry>
++<para>As an example, if the user wished to configure the
++appearance of <quote>comments</quote> while writing C++, she or he
++could choose C++ in the <guilabel>Highlight</guilabel> drop down box, and then
++choose Comment in the <guilabel>Item</guilabel> drop down box. To have
++<quote>comments</quote> look the same across all languages, the user would need
++to configure this in the <guilabel>Defaults</guilabel> page of this dialog box
++while leaving <quote>comments</quote> unconfigured within the more
++specific <guilabel>Highlight Modes</guilabel> page.</para>
++</listitem> </varlistentry>
+ 
+ <varlistentry>
+ <term><guilabel>Item Style</guilabel></term>
+-<listitem><para>Here the user can configure the general appearance of the above
+-selected item.  Checking the <guilabel>Default</guilabel> checkbox causes the default
+-style as configured on the previous tab to be set, or the
+-appearance can be configured directly.  The available options are the same as on the
+-<guilabel>Defaults</guilabel> tab: <guilabel>Normal</guilabel>,
+-<guilabel>Selected</guilabel>, <guilabel>Bold</guilabel> and
+-<guilabel>Italic</guilabel>.</para></listitem> </varlistentry>
++<listitem><para>Here the user can configure the general
++appearance of the above
++selected item.  Checking the
++<guilabel>Default</guilabel> check box causes the
++default style as configured on the previous tab to be set, or
++the appearance can be configured directly.  The available
++options are the same as on the
++<guilabel>Defaults</guilabel> tab:
++<guilabel>Normal</guilabel>,
++<guilabel>Selected</guilabel>, <guilabel>Bold</guilabel>
++and <guilabel>Italic</guilabel>.</para></listitem>
++</varlistentry>
+ 
+ <varlistentry>
+-<term><guilabel>Highlight Auto Select</guilabel></term>  
+-<listitem><para>&kwrite; can apply syntax highlighting automatically, depending  
+-on the file extension or mime-type of the opened file.  The defaults are fairly
+-comprehensive, but users that regularly edit files with non-standard extensions
+-can add them here.  Wildcards are allowed in the <guilabel>File
+-Extensions</guilabel> text box.  For example, the default entry for the C++
+-language is <userinput>*.cpp;*.cc;*.C;*.h</userinput>.  Opening a file called
+-<filename>foo.h</filename> would automatically apply the C++ style to it.
++<term><guilabel>Highlight Auto Select</guilabel></term>
++<listitem><para>&kwrite; can apply syntax highlighting
++automatically, depending on the file extension or mime-type of the opened file.
++The defaults are fairly comprehensive, but users that regularly edit files with
++non-standard extensions can add them here.  Wildcards are allowed in the
++<guilabel>File Extensions</guilabel> text box.  For example, the
++default entry for the C++ language is
++<userinput>*.cpp;*.cc;*.C;*.h</userinput>. Opening a file called
++<filename>foo.h</filename> would automatically apply the
++C++ style to it.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><guilabel>Item Font</guilabel></term>
+-<listitem><para>Here the user can choose the font for the selected item.</para>
++<listitem><para>Here the user can choose the font for the
++selected item.</para>
+ <para>The default style can be applied by checking the
+-<guilabel>Default</guilabel> checkbox or the user can choose a specific font
+-<guilabel>Family</guilabel>, <guilabel>Size</guilabel> and
+-<guilabel>Charset</guilabel>.  The available options are the same as those on
+-the <guilabel>Defaults</guilabel> tab.</para></listitem>
++<guilabel>Default</guilabel> check box or the user can
++choose a specific font
++<guilabel>Family</guilabel>, <guilabel>Size</guilabel>
++and <guilabel>Charset</guilabel>.  The available options are
++the same as those on the <guilabel>Defaults</guilabel> tab.</para></listitem>
+ </varlistentry>
++</variablelist>-->
++</sect1>
++
++<sect1 id="pref-filetypes">
++<title>Filetypes</title>
++<para>This page allows you to override the default configuration for documents
++of specified mimetypes. When the editor loads a document, it will try if it
++matches the file masks or mimetypes for one of the defined filetypes, and if so
++apply the variables defined. If more filetypes match, the one with the highest
++priority will be used.
++</para>
++<variablelist>
++<varlistentry>
++<term><guilabel>Filetype:</guilabel></term>
++<listitem><para>The filetype with the highest priority is the one displayed in
++the first drop down box. If more filetypes were found, they are
++also listed.</para>
++<variablelist>
++<varlistentry>
++<term><guilabel>New</guilabel></term>
++<listitem><para>This is used to create a new filetype. After
++you click on this button, the fields below get empty and you
++can fill the properties you want for the new filetype.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Delete</guilabel></term>
++<listitem><para>To remove an existing filetype, select it from the drop down
++box and press the Delete button.</para></listitem>
++</varlistentry>
+ </variablelist>
+-</chapter>  
+--->  
+-<chapter id="credits">  
+-<title>Credits and Licenses</title>  
+-  
++</listitem> </varlistentry>
++
++<varlistentry>
++<term><guilabel>Properties of current filetype</guilabel></term>
++<listitem><para>The filetype with the highest priority is the one displayed in
++the first drop down box. If more filetypes were found, they are also
++listed.</para>
++<variablelist>
++<varlistentry>
++<term><guilabel>Name:</guilabel></term>
++<listitem><para>The name of the filetype will be the text of the corresponding
++menu item. This name is displayed in the
++<menuchoice><guimenu>Tools</guimenu><guimenuitem>Filetypes</guimenuitem>
++</menuchoice ></para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Section:</guilabel></term>
++<listitem><para>The section name is used to organize the file types in
++menus. This is also used in the
++<menuchoice><guimenu>Tools</guimenu><guimenuitem>Filetypes</guimenuitem>
++</menuchoice> menu.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Variables:</guilabel></term>
++<listitem><para>This string allows you to configure &kwrite;'s settings for the
++files selected by this mimetype using &kwrite; variables. You can set almost any
++configuration option, such as highlight, indent-mode, encoding,
++etc.</para><para>For a full list of known variables, see the
++manual.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>File extensions:</guilabel></term>
++<listitem><para>The wildcards mask allows you to select files by filename. A
++typical mask uses an asterisk and the file extension, for example
++<filename>*.txt; *.text</filename>. The string is a semicolon-separated list of
++masks.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>MIME types:</guilabel></term>
++<listitem><para>Displays a wizard that helps you easily select
++mimetypes.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Priority:</guilabel></term>
++<listitem><para>Sets a priority for this file type. If more than one file type
++selects the same file, the one with the highest priority will be
++used.</para></listitem>
++</varlistentry>
++</variablelist>
++</listitem> </varlistentry>
++
++</variablelist>
++</sect1>
++
++<sect1 id="pref-shortcuts">
++<title>Shortcuts</title>
++<para>You can change here the shortcut keys configuration. Select an
++action and click on <guilabel>Custom</guilabel> if you want a different shortcut
++for this action.</para>
++<para>The search line alllows you to look for a specific action and see
++its associated shortcut.</para>
++</sect1>
++
++<sect1 id="pref-plugins">
++<title>Plugins</title>
++<para>This tab lists all available plugins and you can check those you
++want to use. Once a plugin is checked, the
++<guibutton>Configure</guibutton> button is enabled and you can click it
++in order to configure the highlighted plugin.</para>
++</sect1>
++</chapter>
++
++<chapter id="credits">
++<title>Credits and Licenses</title>
++
+ <para>&kwrite; Copyright 2001 by the &kate; team.</para>
+ 
+ <para>
+-Based on the original &kwrite;, which was Copyright 2000 by Jochen Wilhelmy  
++Based on the original &kwrite;, which was Copyright 2000 by Jochen Wilhelmy
+ <email>digisnap at cs.tu-berlin.de</email>
+ </para>
+ 
+-<para>Contributions:</para>  
++<para>Contributions:</para>
+ 
+ <itemizedlist>
+ <listitem>
+@@ -1740,12 +2912,17 @@
+ <para>&John.Firebaugh; &John.Firebaugh.mail;</para>
+ </listitem>
+ </itemizedlist>
+-     
++
+ <para>
+ Original documentation by &Thad.McGinnis; &Thad.McGinnis.mail;
+ </para>
+ 
+ <para>
++Updated  by &Anne-Marie.Mahfouf; &Anne-Marie.Mahfouf.mail; and
++&Anders.Lund; &Anders.Lund.mail;
++</para>
++
++<para>
+ This version of the &kwrite; Handbook is based on the original by
+ &Cristian.Tibirna; &Cristian.Tibirna.mail;
+ </para>
+@@ -1755,21 +2932,21 @@
+ </para>
+ 
+ <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
+- 
++
+ &underFDL;
+ &underGPL;
+-</chapter> 
++</chapter>
+ 
+-&documentation.index;   
+-</book>  
+-<!--  
+-Local Variables:  
+-mode: sgml  
+-sgml-namecase-general: t  
+-sgml-namecase-entity: nil  
+-sgml-general-insert-case: lower  
+-sgml-minimize-attributes: nil  
+-sgml-omittag: nil  
+-End:  
+--->  
++&documentation.index;
++</book>
++<!--
++Local Variables:
++mode: sgml
++sgml-namecase-general: t
++sgml-namecase-entity: nil
++sgml-general-insert-case: lower
++sgml-minimize-attributes: nil
++sgml-omittag: nil
++End:
++-->
+ 
+--- doc/klipper/index.docbook	(revision 488815)
++++ doc/klipper/index.docbook	(revision 494868)
+@@ -89,9 +89,8 @@
+ open, press <keycombo action="simul">&Alt;<keycap>L</keycap>
+ </keycombo>.</para>
+ 
+-<para>To remove &klipper;, click on the handle next to it (a small
+-black triangle), and from the menu that appears, select
+-<guimenuitem>Remove Klipper</guimenuitem>.</para>
++<para>To remove &klipper;, click on its icon in the System Tray, and from the
++menu that appears, select <guimenuitem>Quit</guimenuitem>.</para>
+ 
+ </sect1>
+ 
+--- doc/faq/filemng.docbook	(revision 488815)
++++ doc/faq/filemng.docbook	(revision 494868)
+@@ -166,5 +166,42 @@
+ 
+ </answer>
+ </qandaentry>
++
++<qandaentry>
++<question><para>How do I make &konqueror; start up without a menu bar?
++I can't save a view profile when the menu bar is invisible!</para>
++</question>
++
++<answer><para>The easiest way to do this is to edit &konqueror;'s
++configuration file manually. Add the following lines to
++<filename>~/.kde/share/config/konquerorrc</filename>:
++<programlisting>
++[KonqMainWindow]
++MenuBar=Disabled
++</programlisting>
++</para>
++
++<para>On restarting &konqueror;, the menubar should be hidden.</para>
++
++</answer>
++</qandaentry>
++
+ </qandaset>
+ </chapter>
++
++<!--Local variables:
++mode: xml
++sgml-omittag:nil
++sgml-shorttag:nil
++sgml-namecase-general:nil
++sgml-general-insert-case:lower
++sgml-minimize-attributes:nil
++sgml-always-quote-attributes:t
++sgml-indent-step:0
++sgml-indent-data:true
++sgml-parent-document:("index.docbook" "book" "chapter")
++sgml-exposed-tags:nil
++sgml-local-catalogs:nil
++sgml-local-ecat-files:nil
++End:
++-->
+--- doc/faq/panel.docbook	(revision 488815)
++++ doc/faq/panel.docbook	(revision 494868)
+@@ -4,9 +4,11 @@
+  "dtd/kdex.dtd">
+ -->
+ 
++
+ <chapter id="panel">
+ <title>The panel</title>
+ 
++
+ <qandaset>
+ <qandaentry>
+ <question>
+@@ -115,5 +117,77 @@
+ </answer>
+ </qandaentry>
+ 
++<qandaentry>
++<question><para>How do I use the &Windows; key to open the &kmenu;?</para>
++</question>
++
++<answer><para>Previous versions of &kde; provided a trick to allow you to
++use the &Windows; key both as a modifier (so you could have shortcuts
++like <keycombo action="simul"><keysym>Win</keysym><keycap>R</keycap>
++</keycombo>), and as a regular key (so that pressing
++<keysym>Win</keysym> on its own could open the &kmenu;). This feature
++was removed for reasons of usability and accessibility, as well as
++keeping the code clean. For current versions of &kde;, you have two
++options: either use a different shortcut to open the &kmenu; (the
++default is <keycombo action="simul">&Alt;<keycap>F1</keycap>
++</keycombo>), or remap the <keysym>Win</keysym> key to be a regular
++key, rather than a modifier.</para>
++
++<para>If you choose to do the second, here's one way:
++
++<orderedlist>
++<listitem><para>Find the keycode for your <keysym>Win</keysym> key
++using <command>xev</command>: Run the command
++<userinput><command>xev</command></userinput> in a &konsole;, and
++press the <keysym>Win</keysym> key. Look in the output of
++<command>xev</command> for
++<computeroutput>keycode <replaceable>n</replaceable></computeroutput>,
++where <replaceable>n</replaceable> is the keycode of the
++<keysym>Win</keysym> key.</para>
++</listitem>
++
++<listitem><para>Use <command>xmodmap</command> to remap the
++<keysym>Win</keysym> key. An appropriate command is <userinput><command>xmodmap
++<option>-e</option> 'keycode
++<replaceable>n</replaceable>=Menu'</command></userinput>.</para>
++</listitem>
++
++<listitem><para>In the &kcontrolcenter;, go to
++<menuchoice><guimenu>Regional &amp;
++Accessibility</guimenu><guimenuitem>Keyboard Shortcuts</guimenuitem>
++</menuchoice> and set the shortcut for <guilabel>Popup Launch
++Menu</guilabel> to the <keysym>Win</keysym> key. You should now be
++able to popup the &kmenu; by pressing the <keysym>Win</keysym> key.</para>
++</listitem>
++
++<listitem><para>One more step is required to save the changes across
++settings: Create a file <filename>~/.kde/env/win-key.sh</filename>
++(create the directory if it doesn't exist), and add the
++<command>xmodmap</command> command you used previously to it. The
++change should now be applied every time you start &kde;.</para>
++</listitem>
++</orderedlist>
++</para>
++</answer>
++</qandaentry>
++
+ </qandaset>
+ </chapter>
++
++<!-- Keep this comment at the end of the file
++Local variables:
++mode: xml
++sgml-omittag:nil
++sgml-shorttag:nil
++sgml-namecase-general:nil
++sgml-general-insert-case:lower
++sgml-minimize-attributes:nil
++sgml-always-quote-attributes:t
++sgml-indent-step:0
++sgml-indent-data:true
++sgml-parent-document:("index.docbook" "book" "chapter")
++sgml-exposed-tags:nil
++sgml-local-catalogs:nil
++sgml-local-ecat-files:nil
++End:
++-->
+--- doc/kicker/index.docbook	(revision 488815)
++++ doc/kicker/index.docbook	(revision 494868)
+@@ -14,8 +14,7 @@
+ <title>The &kicker; Handbook</title>
+ 
+ <authorgroup>
+-<author><personname><firstname>Orville</firstname><surname>Bennett</surname></personname>
+- <email>obennett at hartford.edu</email></author>
++<author>&Orville.Bennett; &Orville.Bennett.mail;</author>
+ <author>&Dirk.Doerflinger; &Dirk.Doerflinger.mail;</author>
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+@@ -26,13 +25,17 @@
+ </copyright>
+ <copyright>
+ <year>2004</year>
+-<holder>Orville Bennett</holder>
++<holder>&Orville.Bennett;</holder>
+ </copyright>
++<copyright>
++<year>2005</year>
++<holder>Titus Laska</holder>
++</copyright>
+ 
+ <legalnotice>&FDLNotice;</legalnotice>
+ 
+-<date>2002-03-01</date>
+-<releaseinfo>3.00.00</releaseinfo>
++<date>2005-11-15</date>
++<releaseinfo>3.01.00</releaseinfo>
+ 
+ <abstract>
+ <para>
+@@ -84,7 +87,7 @@
+ </para>
+ 
+ <screenshot>
+-<screeninfo>Here's a screenshot of the left side of &kicker;</screeninfo>
++<screeninfo>Here is a screenshot of the left side of &kicker;</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="screenshot_left.png" format="PNG"/></imageobject>
+@@ -93,14 +96,14 @@
+ </textobject>
+ <caption>
+ <para>
+-Here's a screenshot of the left side of &kicker;
++This is a screenshot of the left side of &kicker;
+ </para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ 
+ <screenshot>
+-<screeninfo>And here's the right side</screeninfo>
++<screeninfo>And here is the right side</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="screenshot_right.png" format="PNG"/></imageobject>
+@@ -109,7 +112,7 @@
+ </textobject>
+ <caption>
+ <para>
+-And here's the right side
++This is the right side of &kicker;
+ </para>
+ </caption>
+ </mediaobject>
+@@ -184,32 +187,24 @@
+ <para>
+ All running applications are displayed as buttons in the
+ taskbar. Clicking an application's button will bring this application on
+-top. If it was on top before, it will be iconified. As always, more
+-information in <link linkend="applets">Applets</link>.
++top. If it was on top before, it will be iconified. More
++information is available in the <link linkend="applets">Applets</link>
++section.
+ </para>
+ </listitem>
+-
+ </varlistentry>
+-<varlistentry>
+-<term>Lock/Logout</term>
+-<listitem>
+-<para>
+-This applet contains two small buttons. The one with the luggage lock on it
+-locks your session if you ever leave your &kde; unattended and don't want anybody
+-else to have access to it; the other one shuts down &kde; and the X-Server.
+-</para>
+-</listitem>
+-</varlistentry>
+ 
+ <varlistentry>
+ <term>System Tray</term>
+ <listitem>
+ <para>
+ The system tray is able to swallow some kind of applications like - in
+-this case - &klipper;.  There are also more useful apps for the
+-system tray. You can click the applications either with the
++this case - &klipper; and the &korganizer; Reminder Daemon. There are
++many other applications that dock in the system tray, for example &juk;
++and &kopete;. Clicking the icons with the
+ <mousebutton>left</mousebutton> or the <mousebutton>right</mousebutton>
+-mousebutton and see what's happening.
++mousebutton performs specific actions defined for each
++application.
+ </para>
+ </listitem>
+ </varlistentry>
+@@ -262,8 +257,8 @@
+ &kicker;. This section will tell you everything about application
+ starting, folder browsing and adding some kinds of applets and
+ extensions. Lots of things can be done from the <guimenu>context
+-menu</guimenu> or from <guisubmenu>Configure Panel</guisubmenu> in the
+-<guimenu>K</guimenu> Menu.
++menu</guimenu> or via the &kde; <application>Control
++Center</application>'s section <guisubmenu>Configure Panel</guisubmenu>.
+ </para>
+ 
+ <sect2 id="adding-apps">
+@@ -293,9 +288,9 @@
+ <listitem>
+ <para>
+ Click the &RMB; on any free space
+-in &kicker; and choose <guisubmenu>Add</guisubmenu> and then
+-<guisubmenu>Application Button</guisubmenu>. There you can choose an application
+-which will be added in the place you clicked.
++in &kicker; and choose <guisubmenu>Add Application to Panel</guisubmenu>.
++There you can choose an application
++which will then be added to &kicker;.
+ </para>
+ </listitem>
+ </varlistentry>
+@@ -311,13 +306,16 @@
+ 
+ <para>
+ Click the &RMB; on any free space
+-in &kicker; and choose <guisubmenu>Add</guisubmenu>, <guisubmenu>Special
+-Button</guisubmenu> and then <guimenuitem>Non-KDE Application
+-</guimenuitem>. In the newly appearing window, enter the name of the application you
+-wish to add in the <guilabel>Executable:</guilabel> text box.  You can also append <guilabel>Optional command line arguments</guilabel>, have the
+-application start from a terminal, and choose the icon which will appear in
+-&kicker; by clicking the <guiicon>gear</guiicon>. If you don't choose an icon,
+-the application will use the gear as a default.
++in &kicker; and choose <guisubmenu>Add Application to
++Panel</guisubmenu> and then <guimenuitem>Add Non-KDE
++Application</guimenuitem>. In the newly appearing window, enter name and
++description of the application in the first two text boxes. Then fill in
++the command of the application you
++wish to add in the <guilabel>Executable:</guilabel> text box. You can
++also append command line arguments, have
++the application start from a terminal, and choose the icon which will
++appear in &kicker; by clicking the <guiicon>gear</guiicon>. If you don't
++choose an icon, the application will use the gear as a default.
+ </para>
+ </listitem>
+ </varlistentry>
+@@ -462,7 +460,7 @@
+ <guiicon>Bookmarks icon</guiicon> provides fast access to your
+ bookmarks. They appear in the same way as if you click the
+ <guimenu>Bookmarks menu</guimenu> in &konqueror;. Clicking a bookmark in
+-the menu will launch &konqueror; with the <acronym>URL</acronym> which
++the menu will launch &konqueror; with the &URL; which
+ is behind that bookmark.
+ </para>
+ </listitem>
+@@ -516,7 +514,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term>The Non-KDE Application Item</term>
++<term>The Non-&kde; Application Item</term>
+ <listitem>
+ <para>
+ <!-- <guiicon><inlinemediaobject><imageobject><imagedata -->
+@@ -562,13 +560,13 @@
+ Wizard which allows you to simply add a new printer to your system.</para>
+ </listitem>
+ <listitem><para>
+-<guimenuitem>KDE Print Settings</guimenuitem> This item will open the KDE Print
++<guimenuitem>&kde; Print Settings</guimenuitem> This item will open the &kde; Print
+ Configuration dialog.</para>
+ </listitem>
+ 
+ <listitem>
+ <para><guimenuitem>Configure Server</guimenuitem> This item allows configuration
+-of a CUPS Server. An authorization dialog, requiring validation, will be presented
++of a &CUPS; Server. An authorization dialog, requiring validation, will be presented
+ to you before allowing any changes.
+ </para>
+ </listitem>
+@@ -630,9 +628,12 @@
+ 
+ <para>
+ &kicker; comes with a set of applets like the taskbar or the
+-mini-pager. They can be added from the <guimenu>context menu</guimenu> by
+-clicking the &RMB; on any free space in &kicker; and choosing
+-<guisubmenu>Add</guisubmenu> and then <guisubmenu>Applet</guisubmenu>.
++mini-pager. They can be added by choosing <guisubmenu>Add
++Applet to Panel...</guisubmenu> from the <guimenu>context menu</guimenu>,
++which can be opened by
++clicking the &RMB; on any free space in &kicker;. In the upcoming
++dialog, choose an applet to add and click the <guibutton>Add to
++Panel</guibutton> button.
+ </para>
+ 
+ <para>
+@@ -651,10 +652,10 @@
+ <sect2 id="removing-applets">
+ <title>Removing Applets</title>
+ <para>
+-Applets can be removed by choosing <guimenuitem>Remove</guimenuitem>
+-from the <guimenu>context menu</guimenu>, which appears when the &RMB;
+-is clicked on the applet's handle (left or top side of the applet) or in
+-some applets allover the applet. The same <guimenu>menu</guimenu> appears when
++Applets can be removed by choosing the <guimenuitem>Remove</guimenuitem>
++option from the <guimenu>context menu</guimenu>, which appears when the
++&RMB; is clicked on the applet's handle (left or top side of the applet).
++The same <guimenu>menu</guimenu> appears when
+ clicking the small arrow on the applet's handle.
+ </para>
+ 
+@@ -673,11 +674,14 @@
+ </para>
+ 
+ <para>
+-All extensions can be moved to any border of the screen by dragging them
+-with the &LMB; on the small fade-out handles on the left or top side of
+-the extensions.  These fade-out handles can also be used for fading out
+-the extension.  The child panel can also be dragged by clicking with the
+-&LMB; on any empty space on it.
++Extensions can be added by selecting them from the
++submenu <guisubmenu>Add New Panel</guisubmenu> in the <guimenu>context
++menu</guimenu> of &kicker;.
++Most of the extensions can be moved to any border of the screen by
++dragging them with the &LMB; on a free space. If that does not work,
++open the <guimenu>context menu</guimenu> on any free space in &kicker;,
++choose <guimenuitem>Configure Panel...</guimenuitem> and set up the panel
++positions in the appearing dialog.
+ </para>
+ 
+ <para>
+@@ -693,7 +697,9 @@
+ <para>
+ You can remove extensions by clicking <guimenuitem>Remove</guimenuitem>
+ in their <guimenu>context menu</guimenu>, usually located in the
+-fade-out handles.
++fade-out handles or by selecting them from the <guisubmenu>Remove
++Panel</guisubmenu> submenu of the &kicker; <guimenu>context
++menu</guimenu>.
+ </para>
+ </sect2>
+ 
+@@ -717,7 +723,7 @@
+ <title>The <guilabel>General</guilabel> Tab</title>
+ 
+ <para>
+-Here you can see some stats about the application link. You can also
++Here you can see some information about the application link. You can also
+ choose an icon by clicking on the <guibutton>icon button</guibutton>
+ <!-- and change the filename of the link file -->.
+ This may be useful if you want the icon on the panel behave different
+@@ -920,9 +926,9 @@
+ <para>
+ You can change the settings by either clicking
+ <guimenuitem>Configure Panel...</guimenuitem> in the <guimenu>context
+-menu</guimenu> of the <guimenu>K</guimenu> Menu, or in &kcontrol; by going to
+-<guilabel>Desktop</guilabel> and then selecting the <guilabel>Panels</guilabel>
+-module.
++menu</guimenu> of the <guimenu>K</guimenu> Menu, or in &kcontrolcenter; by
++going to <guilabel>Desktop</guilabel> and then selecting the
++<guilabel>Panels</guilabel> module.
+ </para>
+ 
+ 
+@@ -964,7 +970,9 @@
+ will occupy on the side of the screen which it resides. By default this is on the
+ bottom so changing this value will affect a panel's width. The value can be anywhere
+ from 1% to 100%.
+-Checking the checkbox <guilabel>Expand as required to fit contents</guilabel> makes sure that a panel is at least as big as needed to show every icon and applet.
++Checking the check box <guilabel>Expand as required to fit contents</guilabel>
++makes sure that a panel is at least as big as needed to show every icon and
++applet.
+ </para>
+ 
+ <para>
+@@ -989,7 +997,7 @@
+ border it will show up again. Select the <guilabel>Hide automatically</guilabel>
+ option in the <guilabel>Hide Mode</guilabel> frame to enable this feature.
+ You can also configure the amount of time the panel will wait before
+-it hides here.  The checkbox <guilabel>Show panel when switching
++it hides here.  The check box <guilabel>Show panel when switching
+ desktops</guilabel> makes sure that the panel will be shown on the new
+ chosen desktop. Otherwise, if there are too many applets and icons on
+ &kicker;, two small scroll buttons will be displayed to scroll the whole
+@@ -1008,7 +1016,7 @@
+ 
+ <para>
+ You can toggle which hide buttons the chosen panel should have with
+-the checkboxes in the group <guilabel>Panel-Hiding Buttons</guilabel>.
++the check boxes in the group <guilabel>Panel-Hiding Buttons</guilabel>.
+ </para>
+ 
+ <para>
+@@ -1038,20 +1046,22 @@
+ will enable submenus showing your <application>konqueror</application>
+ bookmarks and the last documents you've opened using &kde; applications
+ respectively. The <guilabel>Quick Browser</guilabel> option will enable a browser menu.
+-Enabling the <guilabel>Show side image</guilabel> checkbox will display a neat
++Enabling the <guilabel>Show side image</guilabel> check box will display a neat
+ image on the left side of the <guimenu>K</guimenu> menu.
+ The <guilabel>Menu item format</guilabel> entry allows you to set how
+ detailed the <guimenu>K</guimenu> menu entries will be.
+ The <guilabel>Name</guilabel> option simply shows the application's name in the menu.
+ The <guilabel>Name (Description)</guilabel> option will show a small description
+ besides the name of the application.
+-The <guilabel>Description (Name)</guilabel> option will show the name beside the description of the application.
++The <guilabel>Description (Name)</guilabel> and <guilabel>Name
++(Description)</guilabel> options will show both name and description in
++the KMenu.
+ </para>
+ 
+ <para>
+ In the <guilabel>QuickBrowser Menus</guilabel> frame you can configure
+ whether the panel's browser menus will show hidden files or not (hidden
+-files on UNIX systems are those whose filenames begin with a dot) as
++files on &UNIX; systems are those whose filenames begin with a dot) as
+ well as how many files at most will be shown in a browser menu; the
+ latter option may be especially useful if you have a rather small screen
+ resolution, as the browser menus would otherwise quickly fill up your screen
+@@ -1079,15 +1089,17 @@
+ </para>
+ 
+ <para>
+-Enabling the switch <guilabel>Enable icon zooming</guilabel> will give you the
+-effect that &kicker;'s icons will grow bigger when hovering with the
+-mouse.
++The check box <guilabel>Enable icon mouseover effects</guilabel>
++toggles the large animated tooltips of &kicker;. They show name and
++description of the icons and applets the mousepointer is positioned on.
+ </para>
+ 
+ <para>
+-If <guilabel>Show tooltips</guilabel> is checked, small descriptions of
+-the icons or applets will be shown when the mousepointer rests over an icon for
+-some seconds.
++If <guilabel>Show tooltips</guilabel> is checked, the classical small
++tooltips with descriptions of the icons and applets will be shown if the
++mousepointer rests over an icon for some seconds. Note that this
++has no effect as long as the option to <guilabel>Enable icon mouseover
++effects</guilabel> is enabled.
+ </para>
+ 
+ <para>
+@@ -1166,9 +1178,10 @@
+ desktop background. Check the <guilabel>Enable background
+ image</guilabel> option to enable this feature. You can specify an image
+ file in the edit box below or choose one by clicking on the
+-<guibutton>Browse</guibutton> button. You may also select to check the
+-<guilabel>Colorize to match the desktop color scheme</guilabel> box to do
+-exactly that :-) You'll see a preview of the selected picture on the right.
++<guibutton>Browse</guibutton> button. You may also check the
++<guilabel>Colorize to match the desktop color scheme</guilabel> box to
++modify the background image's colors. You'll see a preview of the selected
++picture on the right.
+ </para>
+ 
+ 
+@@ -1210,7 +1223,7 @@
+ shown on &kde; startup will be loaded internally, others will be loaded
+ using an external wrapper application.</para></listitem>
+ <listitem><para><guilabel>Load all applets internal</guilabel>: will
+-load all applets internally, regardless of whether they're trusted or
++load all applets internally, regardless of whether they are trusted or
+ not.
+ </para>
+ </listitem>
+@@ -1306,13 +1319,23 @@
+ <listitem>
+ <para>
+ <inlinemediaobject><imageobject><imagedata fileref="taskbar_group.png"
+-format="PNG"/></imageobject></inlinemediaobject> This is a feature
+-introduced in &kde; version 2.2. If the option <guilabel>Group similar
+-tasks</guilabel> is set, several instances of the same application are
+-grouped together in one taskbar button.
++format="PNG"/></imageobject></inlinemediaobject>
+ </para>
+ 
+ <para>
++This is an option which helps you if you often lack space in your
++taskbar. If it is set to <guilabel>Always</guilabel>, several
++instances of the same application are grouped together in one taskbar
++button. Select <guilabel>When Taskbar Full</guilabel> to make &kicker;
++only group similar tasks if there is not much space left in the taskbar.
++</para>
++
++</listitem>
++</varlistentry>
++
++</variablelist>
++
++<para>
+ You can define the mouse actions of the taskbar buttons with the settings in
+ the <guilabel>Actions</guilabel> frame. Each action can be one of the
+ following:</para>
+@@ -1388,11 +1411,7 @@
+ <para>Please note that some of these settings only have effect if a
+ taskbar button contains more than one application.
+ </para>
+-</listitem>
+-</varlistentry>
+ 
+-</variablelist>
+-
+ </sect1>
+ 
+ </chapter>
+@@ -1411,7 +1430,7 @@
+ </para>
+ 
+ <sect1 id="kde-group">
+-<title>The <acronym>KDE</acronym> Group</title>
++<title>The &kde; Group</title>
+ 
+ <para>
+ This group is for the common &kde; things in the <guimenu>K</guimenu>
+@@ -1526,7 +1545,7 @@
+ 
+ <warning>
+ <para>
+-This can be dangerous. If the application hangs and can't give up the
++This can be dangerous. If the application hangs and cannot give up the
+ processor, the complete system might hang.
+ </para>
+ </warning>
+@@ -1686,62 +1705,82 @@
+ <title>The Mini-Pager Applet</title>
+ 
+ <para>
+-This little applet shows a preview of the desktops and lets you also
+-choose by a click with the &LMB; which desktop you want to use.
++This little applet shows a preview of the virtual desktops, lets you
++switch between virtual desktops and gives you the ability to move windows
++from one desktop to another by dragging them.
+ </para>
+ 
+ <para>
+-There is also a very useful <guimenu>context menu</guimenu>:
++There is also a very useful <guimenu>context menu</guimenu> used to
++configure this applet:
+ </para>
+ 
+ <variablelist>
+ <varlistentry>
+-<term><guimenuitem>Preview</guimenuitem></term>
++<term><guimenuitem>Configure Desktops...</guimenuitem></term>
+ <listitem>
+ <para>
+-This option lets the mini pager appear as a tiny preview of the desktops
+-with symbolic rectangles for the running applications.
++This opens the configuration dialog for virtual desktops. There you can
++specify how many desktops you want to have and give them names.
+ </para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guimenuitem>Number</guimenuitem></term>
++<term><guisubmenu>Pager Options</guisubmenu></term>
+ <listitem>
+ <para>
+-If this option is chosen, the pager will show the numbers of the
+-desktops
++In this submenu you can configure the appearance of the Mini-Pager. It
++provides the following functionality:
+ </para>
++
++<variablelist>
++
++<varlistentry>
++<term><guimenuitem>Pager Layout</guimenuitem></term>
++<listitem>
++<para>
++In this section you can choose in how many <guimenuitem>Rows</guimenuitem>
++or <guimenuitem>Columns</guimenuitem> the desktop previews are arranged,
++if you want to see which windows are currently visible on the desktops
++and if icons should indicate the applications running on the different
++vitual desktops.
++</para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guimenuitem>Name</guimenuitem></term>
++<term><guimenuitem>Text Label</guimenuitem></term>
+ <listitem>
+ <para>
+-This will let the pager show the names of the desktops, which can be set
+-in the preferences or from <application>Control Center</application>.
++Here you can choose if the desktop previews should be labeled by their
++numbers, their names or if you you don't want them to be labeled at all.
+ </para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guimenuitem>Enable Desktop Preview</guimenuitem></term>
++<term><guimenuitem>Background</guimenuitem></term>
+ <listitem>
+ <para>
+-If this option is checked, a small button will be shown which shows a
+-bigger preview of the running desktops. If you click an application in that
+-preview, it will be activated.
++You can set the background of the pager to
++<guimenuitem>Elegant</guimenuitem>, <guimenuitem>Transparent</guimenuitem>
++or equivalent to the <guimenuitem>Desktop Background</guimenuitem>.
+ </para>
+ </listitem>
+ </varlistentry>
+ 
++</variablelist>
++
++</listitem>
++</varlistentry>
++
+ <varlistentry>
+-<term><guimenuitem>Configure Virtual Desktops...</guimenuitem></term>
++<term><guimenuitem>Launch Pager</guimenuitem></term>
+ <listitem>
+ <para>
+-Here you can set the number of desktops you want to have and the names
+-of them.
++This launches the application &kpager;, which provides functions similar
++to those offered by the Mini-Pager applet.
+ </para>
+ </listitem>
+ </varlistentry>
+@@ -1849,7 +1888,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term>The <guilabel>Plain Clock</guilabel> Tab</term>
++<term>The <guilabel>Plain Clock</guilabel> options</term>
+ <listitem>
+ <para>In the <guilabel>Options</guilabel> section you can check if you
+ want to have the date and/or the seconds shown. In
+@@ -1860,7 +1899,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term>The <guilabel>Digital Clock</guilabel> Tab</term>
++<term>The <guilabel>Digital Clock</guilabel> options</term>
+ <listitem>
+ <para>In the <guilabel>Options</guilabel> section you can check if you
+ want to have the date, the seconds and/or blinking dots shown. In
+@@ -1871,7 +1910,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term>The <guilabel>Analog Clock</guilabel> Tab</term>
++<term>The <guilabel>Analog Clock</guilabel> options</term>
+ <listitem>
+ <para>
+ In the <guilabel>Options</guilabel> section you can check if you want to
+@@ -1888,7 +1927,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term>The <guilabel>Fuzzy Clock</guilabel> Tab</term>
++<term>The <guilabel>Fuzzy Clock</guilabel> options</term>
+ <listitem>
+ <para>
+ In the <guilabel>Options</guilabel> section you can check if you want to
+@@ -1909,7 +1948,7 @@
+ 
+ <para>
+ This option starts the <guilabel>Country &amp; Language</guilabel>
+- configuration module of the &kcontrol;.</para>
++ configuration module of the &kcontrolcenter;.</para>
+ 
+ <note>
+ <para>
+@@ -1923,14 +1962,15 @@
+ <title><guimenuitem>Date and Time Format</guimenuitem></title>
+ 
+ <para>
+-This will open the Date and Time module of &kcontrol; where you can set
++This will open the Date and Time module of the &kcontrolcenter; where you can
++set
+ your formats. There aren't any special permissions needed for that.
+ </para>
+ 
+ </sect2>
+ 
+ <sect2 id="copy-date">
+-<title><guisubmenu>Copy</guisubmenu></title>
++<title><guisubmenu>Copy to Clipboard</guisubmenu></title>
+ 
+ <para>
+ If you need to paste the actual date and/or time in another application
+@@ -1958,9 +1998,20 @@
+ <title>The System Tray Applet</title>
+ 
+ <para>
+-The System Tray is used to dock some special applications like &eg;
+-&klipper; or &kteatime;.
++The System Tray is used to dock some special applications &eg;
++&klipper; or &juk;. The applications shown in the system tray all
++provide individual funtionality. If you need help concerning these
++options, please refer to the application handbooks.
+ </para>
++
++<para>
++The System Tray's <guimenu>context menu</guimenu> provides the option
++<guimenuitem>Configure System Tray...</guimenuitem> . If you click on it,
++a dialog pops up which lets you choose applications that should not be
++permanently visible in the System Tray. Hidden icons can be made visible
++by clicking on the small arrow appearing on the left or top side of the
++applet.
++</para>
+ </sect1>
+ 
+ <sect1 id="lockout-applet">
+@@ -2014,7 +2065,7 @@
+ resources, which only matters on really slow systems, but has the
+ disadvantage, that it uses more space than &klipper; in the system
+ tray. You can read more about that in the manual for
+-<ulink url="help:/klipper/index.html">&klipper;</ulink>
++<ulink url="help:/klipper/index.html">&klipper;</ulink>.
+ </para>
+ </sect1>
+ 
+@@ -2127,8 +2178,7 @@
+ <answer>
+ <para>
+ Click the &RMB; on any free space in &kicker; and choose
+-<guisubmenu>Add</guisubmenu>. From appearing submenu you can choose,
+-what you want to add. See in <link linkend="basics">Kicker Basics</link>
++what you want to add. See in <link linkend="basics">&kicker; Basics</link>
+ for more about that.
+ </para>
+ </answer>
+@@ -2174,7 +2224,7 @@
+ 
+ <answer>
+ <para>
+-Just drag it by holding the &LMB; on the small
++Just drag them by holding the &LMB; on the small
+ <guibutton>handles</guibutton> on the left or the top of the extension.
+ </para>
+ </answer>
+@@ -2183,13 +2233,13 @@
+ <qandaentry>
+ <question>
+ <para>
+-I want the taskbar to show all applications I'm running, independent on
+-which desktop it is. Is that possible?
++I want the taskbar to show all applications I am running, independent on
++which desktop they are. Is that possible?
+ </para>
+ </question>
+ <answer>
+ <para>
+-Yes, click the &RMB; on the small <guibutton>handle</guibutton> of the
++It is. Click the &RMB; on the small <guibutton>handle</guibutton> of the
+ taskbar, then choose <guimenuitem>Configure Taskbar...</guimenuitem> and check
+ <guilabel>Show windows from all desktops</guilabel> in the appearing dialog.
+ </para>
+@@ -2218,8 +2268,8 @@
+ </question>
+ <answer>
+ <para>
+-Just fire up &konqueror;, go to your home folder and drag the
+-<guiicon>KDesktop</guiicon> icon to any free space of &kicker;, then
++Just start &konqueror;, go to your home folder and drag the
++<guiicon>Desktop</guiicon> icon to any free space of &kicker;, then
+ choose <guimenuitem>Add as Quick Browser</guimenuitem> from the
+ appearing menu.
+ </para>
+@@ -2250,7 +2300,7 @@
+ <answer>
+ <para>
+ On some &RedHat;systems, the clock always shows the time in
+-<acronym>GMT</acronym>. This is a bug in the system setup, and not
++&GMT;. This is a bug in the system setup, and not
+ directly related to &kicker;. However, to solve it, just create this
+ symbolic link: <userinput><command>ln</command> <option>-s</option>
+ <filename>/usr/share/zoneinfo</filename>
+@@ -2345,9 +2395,13 @@
+ 
+ <para>Original documentation copyright 2001, 2002 &Dirk.Doerflinger;
+ &Dirk.Doerflinger.mail;</para>
+-<para>Portions copyright 2004 Orville Bennett
+-<email>obennett at hartford.edu</email></para>
++<para>Portions copyright 2004 &Orville.Bennett;
++<email>&Orville.Bennett.mail;</email></para>
++<para>Portions copyright 2005 Titus Laska
++<email>titus.laska at gmx.de</email></para>
+ 
++<!-- TRANS:CREDIT_FOR_TRANSLATORS -->
++
+ &underFDL;               <!-- FDL: do not remove -->
+ &underBSDLicense;        <!-- BSD License -->
+ 
+--- doc/konsole/index.docbook	(revision 488815)
++++ doc/konsole/index.docbook	(revision 494868)
+@@ -39,12 +39,12 @@
+ </copyright>
+ <copyright>
+ <year>2005</year>
+-<holder>Kurt Hindenburg</holder>
++<holder>&Kurt.Hindenburg;</holder>
+ </copyright>
+ 
+ <legalnotice>&FDLNotice;</legalnotice>
+ 
+-<date>2005-06-04</date>
++<date>2005-12-19</date>
+ <releaseinfo>1.6</releaseinfo>
+ 
+ <abstract><para>This document is the user handbook for the &konsole;
+@@ -78,7 +78,7 @@
+ emulator, often referred to as a terminal or a shell. It gives you the
+ equivalent of an old-fashioned text screen on your desktop, but one
+ which can easily share the screen with your graphical
+-applications. Windows users may be familiar with the 
++applications. &Windows; users may be familiar with the 
+ <application>MS-DOS Prompt</application> utility, which has the analogous 
+ function of offering a <trademark>DOS</trademark> command-line under
+ &Windows;. (Although the &UNIX; <acronym>CLI</acronym>s offer far more
+@@ -170,7 +170,7 @@
+ <textobject>
+ <phrase>&konsole; Screen</phrase>
+ </textobject>
+-<caption><para>Konsole with 4 
++<caption><para>&konsole; with 4 
+ terminal sessions open.</para></caption>
+ </mediaobject>
+ </screenshot>
+@@ -399,7 +399,7 @@
+ <term><mousebutton>Right</mousebutton></term>
+ <listitem>
+ <para>The items that appear in the menu when the &RMB;
+-is pressed depend on whether the menu bar is visible.</para>
++is pressed depend on whether the menubar is visible.</para>
+ 
+ <para>Menubar is visible:
+ <guimenuitem>Set Selection End</guimenuitem>,
+@@ -952,7 +952,7 @@
+ <guimenuitem>History...</guimenuitem></menuchoice></term>
+ <listitem><para><anchor id="configure-history"/><action>Open a dialog
+ where you can configure the history</action>.  The
+-<guilabel>Enable</guilabel> checkbox toggles saving of lines that have
++<guilabel>Enable</guilabel> check box toggles saving of lines that have
+ scrolled off the top of the window.  You can enter the <guilabel>Number
+ of lines</guilabel> to remember in the text field, or use the spinner
+ buttons to increase or decrease the number in steps of 100 lines.  The
+@@ -1039,7 +1039,7 @@
+ <varlistentry>
+ <term><menuchoice><guimenu>Help</guimenu><guimenuitem>About
+ KDE...</guimenuitem></menuchoice></term>
+-<listitem><para><action>Information about the KDE
++<listitem><para><action>Information about the &kde;
+ project</action></para></listitem>
+ </varlistentry>
+ </variablelist>
+@@ -1062,7 +1062,7 @@
+ <textobject>
+ <phrase>Tabbar Image</phrase>
+ </textobject>
+-<caption><para>Konsole with 4 terminal sessions open with the tabbar on the bottom.</para></caption>
++<caption><para>&konsole; with 4 terminal sessions open with the tabbar on the bottom.</para></caption>
+ </mediaobject>
+ </screenshot>
+ 
+@@ -1294,9 +1294,9 @@
+ <para>Starts a &konsole; window with 90 columns and 25 rows, with no
+ history</para>
+ 
+-<screen><prompt>&percnt;</prompt> <userinput><command>konsole</command> <option>--noclose</option> <option>-e</option> <parameter>echo_args</parameter> <parameter>Hello, thanks for using Konsole!</parameter></userinput></screen>
++<screen><prompt>&percnt;</prompt> <userinput><command>konsole</command> <option>--noclose</option> <option>-e</option> <parameter>echo_args</parameter> <parameter>Hello, thanks for using &konsole;!</parameter></userinput></screen>
+ 
+-<para>Starts a &konsole; window with the text printed 'Hello, thanks for using Konsole!'
++<para>Starts a &konsole; window with the text printed 'Hello, thanks for using &konsole;!'
+ </para>
+ <para>The <parameter>echo_args</parameter> is a simple Bash script:
+ <programlisting>#!/bin/bash
+@@ -1309,7 +1309,7 @@
+ <variablelist>
+ <varlistentry>
+ <term><option>--help-qt</option></term>
+-<listitem><para><action>List Qt-specific options</action></para></listitem>
++<listitem><para><action>List &Qt;-specific options</action></para></listitem>
+ </varlistentry>
+ </variablelist>
+ 
+@@ -1349,7 +1349,7 @@
+ <variablelist>
+ <varlistentry>
+ <term><option>--help-kde</option></term>
+-<listitem><para><action>List KDE-specific options</action></para></listitem>
++<listitem><para><action>List &kde;-specific options</action></para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--help-all</option></term>
+@@ -1372,11 +1372,11 @@
+ </sect1>
+ 
+ <sect1 id="dcop">
+-<title>DCOP</title>
++<title>&DCOP;</title>
+ 
+ <para>For an introduction to 
+ &DCOP; and using <command>dcop</command> please look at
+-<ulink url="help:/khelpcenter/userguide/kde-diy.html#dcop">the User Guide entry on DCOP</ulink>.
++<ulink url="help:/khelpcenter/userguide/kde-diy.html#dcop">the User Guide entry on &DCOP;</ulink>.
+ </para>
+ 
+ </sect1>
+@@ -1419,9 +1419,9 @@
+ 
+ <para>For more infomation please visit these websites:</para>
+ <itemizedlist>
+-<listitem><para><ulink url="http://freebsd.kde.org/">KDE on 
++<listitem><para><ulink url="http://freebsd.kde.org/">&kde; on 
+ FreeBSD</ulink></para></listitem>
+-<listitem><para><ulink url="http://solaris.kde.org/">KDE on Solaris</ulink></para></listitem>
++<listitem><para><ulink url="http://solaris.kde.org/">&kde; on &Solaris;</ulink></para></listitem>
+ </itemizedlist>
+ 
+ </appendix>
+--- doc/kdm/Makefile.am	(revision 488815)
++++ doc/kdm/Makefile.am	(revision 494868)
+@@ -1,7 +1,6 @@
+-ref: $(srcdir)/kdmrc-ref.docbook
+ conf_def = $(top_srcdir)/kdm/config.def
+-$(srcdir)/kdmrc-ref.docbook: $(conf_def) $(top_srcdir)/kdm/confproc.pl
+-	$(PERL) -w $(top_srcdir)/kdm/confproc.pl --doc $(conf_def) $@
++ref: $(conf_def) $(top_srcdir)/kdm/confproc.pl
++	$(PERL) -w $(top_srcdir)/kdm/confproc.pl --doc $(conf_def) kdmrc-ref.docbook
+ 
+ KDE_LANG = en
+ KDE_DOCS = AUTO
+--- doc/kdm/kdmrc-ref.docbook	(revision 488815)
++++ doc/kdm/kdmrc-ref.docbook	(revision 494868)
+@@ -1,4 +1,4 @@
+-<!-- generated from /home/ossi/src/kde/head/kdebase/kdm/config.def - DO NOT EDIT! -->
++<!-- generated from ../../kdm/config.def - DO NOT EDIT! -->
+ 
+ <chapter id="kdm-files">
+ <title>The Files &kdm; Uses for Configuration</title>
+@@ -663,8 +663,10 @@
+ <para>
+ The command line to start the &X-Server;, without display number and VT spec.
+ This string is subject to word splitting.
++</para><para>
++The default is something reasonable for the system on which &kdm; was built,
++like <command>/usr/X11R6/bin/X</command>.
+ </para>
+-<para>The default is <quote>DEF_SERVER_CMD</quote>.</para>
+ </listitem>
+ </varlistentry>
+ 
+@@ -696,6 +698,9 @@
+ <para>
+ The VT the &X-Server; should run on.
+ <option>ServerVTs</option> should be used instead of this option.
++Leave it zero to let &kdm; assign a <acronym>VT</acronym> automatically.
++Set it to <literal>-1</literal> to avoid assigning a <acronym>VT</acronym>
++alltogether - this is required for setups with multiple physical consoles.
+ Currently Linux only.
+ </para>
+ </listitem>
+@@ -1155,6 +1160,27 @@
+ </varlistentry>
+ 
+ <varlistentry>
++<term id="option-autologinagain"><option>AutoLoginAgain</option></term>
++<listitem>
++<para>
++If true, auto-login after logout. If false, auto-login is performed only
++when a display session starts up.
++</para>
++<para>The default is <quote>false</quote>.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term id="option-autologindelay"><option>AutoLoginDelay</option></term>
++<listitem>
++<para>
++The delay in seconds before automatic login kicks in. This is also known as
++<quote>Timed Login</quote>.
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
+ <term id="option-autologinuser"><option>AutoLoginUser</option></term>
+ <listitem>
+ <para>
+@@ -1177,6 +1203,17 @@
+ </varlistentry>
+ 
+ <varlistentry>
++<term id="option-autologinlocked"><option>AutoLoginLocked</option></term>
++<listitem>
++<para>
++Immediately lock the automatically started session. This works only with
++KDE sessions.
++</para>
++<para>The default is <quote>false</quote>.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
+ <term id="option-sessionsdirs"><option>SessionsDirs</option></term>
+ <listitem>
+ <para>
+@@ -1356,42 +1393,42 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term id="option-greetfont"><option>GreetFont</option></term>
++<term id="option-antialiasing"><option>AntiAliasing</option></term>
+ <listitem>
+ <para>
+-The font for the greeter headline.
++Whether the fonts used in the greeter should be antialiased.
+ </para>
+-<para>The default is <quote>charter,24,bold</quote>.</para>
++<para>The default is <quote>false</quote>.</para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term id="option-stdfont"><option>StdFont</option></term>
++<term id="option-greetfont"><option>GreetFont</option></term>
+ <listitem>
+ <para>
+-The normal font used in the greeter.
++The font for the greeter headline.
+ </para>
+-<para>The default is <quote>helvetica,12</quote>.</para>
++<para>The default is <quote>Serif,20,bold</quote>.</para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term id="option-failfont"><option>FailFont</option></term>
++<term id="option-stdfont"><option>StdFont</option></term>
+ <listitem>
+ <para>
+-The font used for the <quote>Login Failed</quote> message.
++The normal font used in the greeter.
+ </para>
+-<para>The default is <quote>helvetica,12,bold</quote>.</para>
++<para>The default is <quote>Sans Serif,10</quote>.</para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term id="option-antialiasing"><option>AntiAliasing</option></term>
++<term id="option-failfont"><option>FailFont</option></term>
+ <listitem>
+ <para>
+-Whether the fonts used in the greeter should be antialiased.
++The font used for the <quote>Login Failed</quote> message.
+ </para>
+-<para>The default is <quote>false</quote>.</para>
++<para>The default is <quote>Sans Serif,10,bold</quote>.</para>
+ </listitem>
+ </varlistentry>
+ 
+--- klipper/klipperrc.desktop	(revision 488815)
++++ klipper/klipperrc.desktop	(revision 494868)
+@@ -384,7 +384,7 @@
+ Description[fa]=ارسال &نشانی
+ Description[fi]=Lähetä &URL
+ Description[fr]=Envoyer l'&URL
+-Description[fy]=Stjoer &URL-adres
++Description[fy]=&URL-adres stjoere
+ Description[ga]=Seol &URL
+ Description[gl]=Enviar &URL
+ Description[he]=שלח &כתובת
+@@ -508,7 +508,7 @@
+ Description[fa]=ارسال &صفحه
+ Description[fi]=Lähetä &Sivu
+ Description[fr]=Envoyer la &page
+-Description[fy]=Stjoer &Side
++Description[fy]=&Side stjoere
+ Description[ga]=Seol &Leathanach
+ Description[gl]=Enviar &Páxina
+ Description[he]=&שלח עמוד
+@@ -1022,7 +1022,7 @@
+ Description[fa]=نشانی پرونده‌ی محلی
+ Description[fi]=Paikallisen tiedoston URL
+ Description[fr]=URL locale
+-Description[fy]=Lokale triems-URL-adres
++Description[fy]=Lokale triem-URL-adres
+ Description[gl]=URL do arquivo local
+ Description[he]=כתובת של קובץ מקומי
+ Description[hi]=स्थानीय फ़ाइल यूआरएल
+@@ -1096,7 +1096,7 @@
+ Description[fa]=ارسال &نشانی
+ Description[fi]=Lähetä &URL
+ Description[fr]=Envoyer l'&URL
+-Description[fy]=Stjoer &URL-adres
++Description[fy]=&URL-adres stjoere
+ Description[ga]=Seol &URL
+ Description[gl]=Enviar &URL
+ Description[he]=שלח &כתובת
+@@ -1170,7 +1170,7 @@
+ Description[fa]=ارسال پر&ونده
+ Description[fi]=Lähetä &tiedosto
+ Description[fr]=Envoyer le &fichier
+-Description[fy]=Stjoer &Triem
++Description[fy]=&Triem stjoere
+ Description[ga]=Seol &Comhad
+ Description[gl]=Enviar &Arquivo
+ Description[he]=שלח &קובץ
+@@ -1296,7 +1296,7 @@
+ Description[fa]=ارسال &نشانی
+ Description[fi]=Lähetä &URL
+ Description[fr]=Envoyer l'&URL
+-Description[fy]=Stjoer &URL-adres
++Description[fy]=&URL-adres stjoere
+ Description[ga]=Seol &URL
+ Description[gl]=Enviar &URL
+ Description[he]=שלח &כתובת
+@@ -1370,7 +1370,7 @@
+ Description[fa]=ارسال پر&ونده
+ Description[fi]=Lähetä &tiedosto
+ Description[fr]=Envoyer le &fichier
+-Description[fy]=Stjoer &Triem
++Description[fy]=&Triem stjoere
+ Description[ga]=Seol &Comhad
+ Description[gl]=Enviar &Arquivo
+ Description[he]=שלח &קובץ
+@@ -1729,7 +1729,7 @@
+ Description[fa]=ارسال &نشانی
+ Description[fi]=Lähetä &URL
+ Description[fr]=Envoyer l'&URL
+-Description[fy]=Stjoer &URL-adres
++Description[fy]=&URL-adres stjoere
+ Description[ga]=Seol &URL
+ Description[gl]=Enviar &URL
+ Description[he]=שלח &כתובת
+@@ -1803,7 +1803,7 @@
+ Description[fa]=ارسال پر&ونده
+ Description[fi]=Lähetä &tiedosto
+ Description[fr]=Envoyer le &fichier
+-Description[fy]=Stjoer &Triem
++Description[fy]=&Triem stjoere
+ Description[ga]=Seol &Comhad
+ Description[gl]=Enviar &Arquivo
+ Description[he]=שלח &קובץ
+--- kicker/menuext/kdeprint/printmenu.desktop	(revision 488815)
++++ kicker/menuext/kdeprint/printmenu.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[fa]=سیستم چاپ
+ Name[fi]=Tulostusjärjestelmä
+ Name[fr]=Système d'impression
+-Name[fy]=Ofdruksysteem
++Name[fy]=Printsysteem
+ Name[ga]=Córas Priontála
+ Name[gl]=Sistema de Impresión
+ Name[he]=מערכת הדפסה
+--- kicker/menuext/recentdocs/recentdocs.desktop	(revision 488815)
++++ kicker/menuext/recentdocs/recentdocs.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[fa]=اسناد اخیر
+ Name[fi]=Viimeaikaiset asiakirjat
+ Name[fr]=Documents récents
+-Name[fy]=Resinte dokuminten
++Name[fy]=Nijste dokuminten
+ Name[ga]=Cáipéisí is déanaí
+ Name[gl]=Documentos Recentes
+ Name[he]=מסמכים אחרונים
+--- kicker/libkicker/panelbutton.h	(revision 488815)
++++ kicker/libkicker/panelbutton.h	(revision 494868)
+@@ -456,6 +456,9 @@
+      */
+     virtual void slotExecMenu();
+ 
++private slots:
++    void menuAboutToHide();
++
+ private:
+     QPopupMenu *m_popup;
+     bool m_pressedDuringPopup;
+--- kicker/libkicker/panelbutton.cpp	(revision 488815)
++++ kicker/libkicker/panelbutton.cpp	(revision 494868)
+@@ -849,13 +849,15 @@
+     if (m_popup)
+     {
+         m_popup->removeEventFilter(this);
++        disconnect(m_popup, SIGNAL(aboutToHide()), this, SLOT(menuAboutToHide()));
+     }
+ 
+     m_popup = popup;
+ 
+-    if (popup)
++    if (m_popup)
+     {
+         m_popup->installEventFilter(this);
++        connect(m_popup, SIGNAL(aboutToHide()), this, SLOT(menuAboutToHide()));
+     }
+ }
+ 
+@@ -906,7 +908,11 @@
+ {
+     if (isDown())
+     {
+-        m_popup->hide();
++        if (m_popup)
++        {
++            m_popup->hide();
++        }
++
+         setDown(false);
+         return;
+     }
+@@ -935,6 +941,15 @@
+ 
+     m_popup->adjustSize();
+     m_popup->exec(KickerLib::popupPosition(popupDirection(), m_popup, this));
++}
++
++void PanelPopupButton::menuAboutToHide()
++{
++    if (!m_popup)
++    {
++        return;
++    }
++
+     setDown(false);
+     KickerTip::enableTipping(true);
+ }
+--- kicker/extensions/dockbar/dockbarextension.desktop	(revision 488815)
++++ kicker/extensions/dockbar/dockbarextension.desktop	(revision 494868)
+@@ -87,7 +87,7 @@
+ Comment[fa]=پسوند صفحه‌ی کنترل کودک.
+ Comment[fi]=Upota ohjelmapalkkilaajennus
+ Comment[fr]=Stockage des applications dans une barre.
+-Comment[fy]=In balke wêryn tapassingen hun ikoan kinne pleatse
++Comment[fy]=In balke wêryn tapassingen hun byldkaike kinne pleatse
+ Comment[gl]=Extensión de acoplamento de barras de aplicazón
+ Comment[he]=הרחבת מעגן יישומים
+ Comment[hi]=अनुप्रयोग पट्टी विस्तार डॉक करें
+--- kicker/extensions/sidebar/sidebarextension.desktop	(revision 488815)
++++ kicker/extensions/sidebar/sidebarextension.desktop	(revision 494868)
+@@ -89,6 +89,7 @@
+ Comment[it]=Wrapper per il pannello di navigazione di konqueror
+ Comment[ja]=Konquerorのナビゲーションパネルのラッパー
+ Comment[km]=Wrapper ជុំ​វិញ​បន្ទះ​រុករក​របស់ Konqueror
++Comment[lt]=Konqueror navigacijos pulto dÄ—klas
+ Comment[lv]=Iekarotāja navigācijas paneļa vraperis
+ Comment[mk]=Обвивка околу навигациониот панел на Konqueror
+ Comment[mt]="Wrapper" madwar il-pannell ta' navigazzjoni ta' Konqueror
+--- kicker/kicker/core/extensionSettings.kcfg	(revision 488815)
++++ kicker/kicker/core/extensionSettings.kcfg	(revision 494868)
+@@ -11,7 +11,7 @@
+ <group name="General">
+ 
+ <entry name="IExist" type="Bool">
+-    <label>Whether this panel actually exists or not. Primarly to work around the fact that KConfigXT won't write a config file unless there is at least one non-default entry.</label>
++    <label>Whether this panel actually exists or not. Primarily to work around the fact that KConfigXT won't write a config file unless there is at least one non-default entry.</label>
+     <default>false</default>
+ </entry>
+ <entry name="Position" type="Int" >
+--- kicker/kicker/buttons/exec.desktop	(revision 488815)
++++ kicker/kicker/buttons/exec.desktop	(revision 494868)
+@@ -13,7 +13,7 @@
+ Name[eu]=KDEren ez diren aplikazio abiarazlea
+ Name[fi]=Ei-KDE:n sovellusten käynnistäjä
+ Name[fr]=Lancement des applications non KDE
+-Name[fy]=Net-KDE-programma's bejinner
++Name[fy]=Net-KDE-programma's útfierder
+ Name[gl]=Lanzador de Aplicazóns Non-KDE
+ Name[hu]=Programindító nem KDE-s alkalmazásokhoz
+ Name[is]=Ræsir fyrir ekki-KDE forrit
+@@ -57,7 +57,7 @@
+ Comment[eu]=K Menuan ez dauden aplikazio abiarazlea
+ Comment[fi]=Käynnistäjä ohjelmille, jotka eivät ole K-valikossa
+ Comment[fr]=Lancement des programmes n'étant pas dans le menu K
+-Comment[fy]=In begjinner foar it útfieren fan programma's hokker net yn it K-menu stean
++Comment[fy]=In útfierder foar programma's hokker net yn it K-menu stean
+ Comment[gl]=Un lanzador para aplicazóns que non estexan no Menu de KDE
+ Comment[hu]=Programindító
+ Comment[is]=Ræsir fyrir forrit sem eru ekki í K valmyndinni
+--- kicker/applets/media/mediumbutton.cpp	(revision 488815)
++++ kicker/applets/media/mediumbutton.cpp	(revision 494868)
+@@ -73,6 +73,7 @@
+ MediumButton::~MediumButton()
+ {
+ 	QPopupMenu *menu = popup();
++	setPopup(0);
+ 	delete menu;
+ }
+ 
+--- kicker/applets/launcher/quicklauncher.desktop	(revision 488815)
++++ kicker/applets/launcher/quicklauncher.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[fa]=گشاینده‌ی سریع
+ Name[fi]=Sovellusten pikakäynnistin
+ Name[fr]=Lanceur d'applications
+-Name[fy]=Snelstarter
++Name[fy]=Snel útfierder
+ Name[ga]=Tosaitheoir Tapa
+ Name[gl]=Lanzador Rápido
+ Name[he]=הפעלה מהירה
+--- kicker/applets/trash/trashapplet.desktop	(revision 488815)
++++ kicker/applets/trash/trashapplet.desktop	(revision 494868)
+@@ -1,46 +1,24 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Type=Plugin
+-Comment=Displays the trashbin and allows dropping files on it
+-Comment[af]=Vertoon die asblik en laat toe dat lêers in dit gegooi kan word
+-Comment[bg]=Показване на кошчето и възможност за преместване на файлове в него
+-Comment[bn]=আবর্জনার বাক্স দেখায়, যাতে ফাইল ড্রপ করা যায়
++Comment=Displays the trashcan and allows files to be dropped onto it
+ Comment[da]=Viser affaldsspanden og tillader at filer droppes på den
+-Comment[de]=Mülleimerfunktion in der Kontrollleiste
+-Comment[el]=Εμφανίζει τον Κάδο Απορριμμάτων και επιτρέπει την ελευθέρωση αρχείων πάνω του
+-Comment[en_GB]=Displays the wastebin and allows dropping files on to it
++Comment[el]=Εμφανίζει τον Κάδο Απορριμμάτων και επιτρέπει την απόθεση αρχείων πάνω του
++Comment[en_GB]=Displays the wastebin and allows files to be dropped onto it
+ Comment[es]=Muestra la papelera y permite tirar archivos en ella
+ Comment[et]=Näitab prügikasti ning lubab faile sellesse visata
+-Comment[eu]=Zakarontzia bistaratzen du, fitxategiak jauregitea lagunduz
+-Comment[fi]=Näyttää roskakorin ja sallii tiedostojen pudottamisen siihen
+ Comment[fr]=Affiche la corbeille et permet d'y déposer des fichiers
+ Comment[fy]=Lit it jiskefet sjen en stiet ta dat triemen fuortsmiten wurde troch se nei it byldkaike ta te slepen
+-Comment[gl]=Mostra a papeleira e permite deitar arquivos nela
+ Comment[hu]=Megjeleníti a szemétkosarat, lehetővé téve fájlok belehelyezését
+ Comment[is]=Sýnir ruslakörfuna og leyfir að skrám sé sleppt á hana
+-Comment[it]=Mostra il cestino e permette di trascinarci sopra i file
+-Comment[ja]=ごみ箱を表示し、ごみ箱へのファイルの投棄を可能にする。
+-Comment[km]=បង្ហាញ​ធុង​សំរាម និង អនុញ្ញាត​ឲ្យ​ទម្លាក់​ឯកសារ​លើ​វា
+ Comment[lt]=Rodo šiukšliadėžę ir leidžia į ją tempiant numesti bylas
+-Comment[mk]=Ја прикажува корпата и овозможува пуштање датотеки врз неа
+-Comment[nb]=Viser papirkurven og lar deg legge filer i den
+-Comment[nds]=Affalltünn för dat Paneel
+-Comment[nl]=Toont de prullenbak en staat toe bestanden weg te gooien door ze naar het pictogram te slepen
+-Comment[nn]=Viser papirkorga og lèt deg leggja filer i henne.
+-Comment[pl]=Pokazuje kosz i pozwala przeciągać do niego pliki
++Comment[nds]=Wiest de Affalltünn, Dateien köönt dor op droppt warrn.
++Comment[nl]=Toont de prullenbak en maakt het mogelijk bestanden weg te gooien door ze naar het pictogram te slepen
+ Comment[pt]=Mostra o caixote do lixo e permite largar ficheiros nele
+-Comment[pt_BR]=Exibe a lixeira e permite arrastar arquivos até ela.
+-Comment[ru]=Показ Корзины на рабочем столе с возможностью выкидывать файлы в неё
+-Comment[se]=Čájeha ruskalihti masa sáhtát luotit fiillaid
+-Comment[sl]=Prikaz ikone za Smeti, na katero lahko odvržete datoteke
+-Comment[sr]=Приказује канту за смеће и омогућава испуштање фајлова на њу
+-Comment[sr at Latn]=Prikazuje kantu za smeće i omogućava ispuštanje fajlova na nju
++Comment[pt_BR]=Mostra o caixote do lixo e permite largar ficheiros nele
+ Comment[sv]=Visar papperskorgen och tillåter att filer släpps på den
+-Comment[tg]=Нишон додани сабат ва партофтани файлҳо ба он
+-Comment[th]=แสดงถังขยะและอนุญาตให้มีการทิ้งแฟ้มลงไปได้
+ Comment[uk]=Показує смітник і дає змогу вкидати в нього файли
+ Comment[zh_CN]=显示回收站,并允许您将文件拖至其上
+-Comment[zh_TW]=顯示垃圾筒並且允許將檔案丟到其中
+ Name=Trash
+ Name[af]=Gemors
+ Name[ar]=سلة النفايات
+--- kicker/applets/swallow/swallowapplet.desktop	(revision 488815)
++++ kicker/applets/swallow/swallowapplet.desktop	(revision 494868)
+@@ -20,7 +20,7 @@
+ Name[fa]=برنامک قورت دادنی
+ Name[fi]=Upotussovelma
+ Name[fr]=Applet englobante
+-Name[fy]=Ynslútte applet
++Name[fy]=Ynslúte applet
+ Name[gl]=Applet Swallow
+ Name[he]=יישומון מעגן
+ Name[hi]=स्वालो ऐपलेट
+--- kicker/applets/minipager/pagerbutton.h	(revision 488815)
++++ kicker/applets/minipager/pagerbutton.h	(revision 494868)
+@@ -49,7 +49,7 @@
+ 
+ //    void setOn( bool b ) { QButton::setOn( b ); }
+     void rename();
+-    void loadBgPixmap();
++    void backgroundChanged();
+     void windowsChanged();
+ 
+ signals:
+@@ -79,6 +79,7 @@
+ 
+ private:
+     bool shouldPaintWindow( KWin::WindowInfo *info );
++    void loadBgPixmap();
+ 
+     KMiniPager* m_pager;
+     int m_desktop;
+@@ -91,6 +92,8 @@
+ 
+     KSharedPixmap *m_sharedPixmap;
+     KPixmap *m_bgPixmap;
++    static KSharedPixmap *s_commonSharedPixmap;
++    static KPixmap *s_commonBgPixmap;
+     bool m_isCommon;
+ 
+     Task::Ptr m_currentWindow;
+--- kicker/applets/minipager/pagerapplet.cpp	(revision 488815)
++++ kicker/applets/minipager/pagerapplet.cpp	(revision 494868)
+@@ -166,7 +166,7 @@
+         return;
+     }
+ 
+-    m_desktops[desk - 1]->loadBgPixmap();
++    m_desktops[desk - 1]->backgroundChanged();
+ }
+ 
+ void KMiniPager::slotSetDesktop(int desktop)
+@@ -735,8 +735,16 @@
+             m_settings->setBackgroundType(PagerSettings::EnumBackgroundType::BgTransparent);
+             break;
+         case PagerSettings::EnumBackgroundType::BgLive + bgOffset:
++        {
+             m_settings->setBackgroundType(PagerSettings::EnumBackgroundType::BgLive);
++            QValueList<KMiniPagerButton*>::ConstIterator it;
++            QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
++            for( it = m_desktops.begin(); it != itEnd; ++it )
++            {
++                (*it)->backgroundChanged();
++            }
+             break;
++        }
+ 
+         case PagerSettings::EnumLabelType::LabelNone + labelOffset:
+             m_settings->setLabelType(PagerSettings::EnumLabelType::LabelNone);
+--- kicker/applets/minipager/pagerbutton.cpp	(revision 488815)
++++ kicker/applets/minipager/pagerbutton.cpp	(revision 494868)
+@@ -55,6 +55,9 @@
+ #undef FocusOut
+ #endif
+ 
++KSharedPixmap* KMiniPagerButton::s_commonSharedPixmap;
++KPixmap* KMiniPagerButton::s_commonBgPixmap;
++
+ KMiniPagerButton::KMiniPagerButton(int desk, KMiniPager *parent, const char *name)
+     : QButton(parent, name, WRepaintNoErase),
+       m_pager(parent),
+@@ -81,6 +84,7 @@
+     {
+         setMouseTracking(true);
+     }
++    loadBgPixmap();
+ }
+ 
+ KMiniPagerButton::~KMiniPagerButton()
+@@ -138,8 +142,20 @@
+     update();
+ }
+ 
++void KMiniPagerButton::backgroundChanged()
++{
++    delete s_commonSharedPixmap;
++    s_commonSharedPixmap = 0;
++    delete s_commonBgPixmap;
++    s_commonBgPixmap = 0;
++    loadBgPixmap();
++}
++
+ void KMiniPagerButton::loadBgPixmap()
+ {
++    if (m_pager->bgType() != PagerSettings::EnumBackgroundType::BgLive)
++        return; // not needed
++
+     DCOPClient *client = kapp->dcopClient();
+     if (!client->isAttached())
+     {
+@@ -158,21 +174,48 @@
+         }
+     }
+ 
++    if (m_isCommon)
++    {
++        if (s_commonBgPixmap)
++        { // pixmap is already ready, just use it
++            backgroundLoaded( true );
++            return;
++        }
++        else if (s_commonSharedPixmap)
++        { // other button is already fetching the pixmap
++            connect(s_commonSharedPixmap, SIGNAL(done(bool)),
++                    SLOT(backgroundLoaded(bool)));
++            return;
++        }
++    }
++
+     QDataStream args( data, IO_WriteOnly );
+     args << 1;
+     client->send("kdesktop", "KBackgroundIface", "setExport(int)", data);
+ 
+-    if (!m_sharedPixmap)
++    if (m_isCommon)
+     {
+-        m_sharedPixmap = new KSharedPixmap;
+-        connect(m_sharedPixmap, SIGNAL(done(bool)),
+-                SLOT(backgroundLoaded(bool)));
++        if (!s_commonSharedPixmap)
++        {
++            s_commonSharedPixmap = new KSharedPixmap;
++            connect(s_commonSharedPixmap, SIGNAL(done(bool)),
++                    SLOT(backgroundLoaded(bool)));
++        }
++        s_commonSharedPixmap->loadFromShared(QString("DESKTOP1"));
+     }
+-
+-    m_sharedPixmap->loadFromShared(QString("DESKTOP%1").arg(m_isCommon ? 1 : m_desktop));
++    else
++    {
++        if (!m_sharedPixmap)
++        {
++            m_sharedPixmap = new KSharedPixmap;
++            connect(m_sharedPixmap, SIGNAL(done(bool)),
++                    SLOT(backgroundLoaded(bool)));
++        }
++        m_sharedPixmap->loadFromShared(QString("DESKTOP%1").arg(m_desktop));
++    }
+ }
+ 
+-QPixmap scalePixmap(const QPixmap &pixmap, int width, int height)
++static QPixmap scalePixmap(const QPixmap &pixmap, int width, int height)
+ {
+     if (pixmap.width()>100)
+     {
+@@ -196,9 +239,24 @@
+         {
+             m_bgPixmap = new KPixmap;
+         }
++        if (m_isCommon)
++        {
++            if (!s_commonBgPixmap)
++            {
++                s_commonBgPixmap = new KPixmap;
++                *s_commonBgPixmap = scalePixmap(*s_commonSharedPixmap, width(), height());
++                s_commonSharedPixmap->deleteLater(); // let others get the signal too
++                s_commonSharedPixmap = 0;
++            }
++            *m_bgPixmap = *s_commonBgPixmap;
++        }
++        else
++        {
++            *m_bgPixmap = scalePixmap(*m_sharedPixmap, width(), height());
++            delete m_sharedPixmap;
++            m_sharedPixmap = 0L;
++        }
+ 
+-        *m_bgPixmap = scalePixmap(*m_sharedPixmap, width(), height());
+-
+         update();
+     }
+     else
+@@ -226,11 +284,6 @@
+     // background...
+     if (liveBkgnd)
+     {
+-        if (!m_bgPixmap)
+-        {
+-            loadBgPixmap();
+-        }
+-
+         if (m_bgPixmap && !m_bgPixmap->isNull())
+         {
+             if (on)
+@@ -693,7 +746,7 @@
+     if (taskCounter > 0)
+     {
+         data.subtext.prepend(i18n("One window:",
+-                                  "%n Windows:",
++                                  "%n windows:",
+                                   taskCounter));
+     }
+ 
+--- kioslave/media/medianotifier/medianotifier.cpp	(revision 488815)
++++ kioslave/media/medianotifier/medianotifier.cpp	(revision 494868)
+@@ -157,7 +157,7 @@
+ 	// The desktop environment MUST prompt the user for confirmation
+ 	// before automatically starting an application.
+ 	QString mediumType = medium.mimeTypePtr()->name();
+-	QString text = i18n( "An autorun file as been found on your '%1'."
++	QString text = i18n( "An autorun file has been found on your '%1'."
+ 	                     " Do you want to execute it?\n"
+ 	                     "Note that executing a file on a medium may compromise"
+ 	                     " your system's security").arg( mediumType );
+@@ -231,7 +231,7 @@
+ 	// before opening the file.
+ 	QString mediumType = medium.mimeTypePtr()->name();
+ 	QString filename = url.filename();
+-	QString text = i18n( "An autoopen file as been found on your '%1'."
++	QString text = i18n( "An autoopen file has been found on your '%1'."
+ 	                     " Do you want to open '%2'?\n"
+ 	                     "Note that opening a file on a medium may compromise"
+ 	                     " your system's security").arg( mediumType ).arg( filename );
+--- kioslave/media/medianotifier/medianotifier.desktop	(revision 488815)
++++ kioslave/media/medianotifier/medianotifier.desktop	(revision 494868)
+@@ -8,48 +8,25 @@
+ X-KDE-Kded-autoload=true
+ X-KDE-Kded-load-on-demand=false
+ Name=Media Notifier Daemon
+-Name[af]=Media Inkennistelling Bediener
+-Name[bg]=Мултимедиен демон
+-Name[bn]=মিডিয়া বিজ্ঞপ্তি ডিমন
+ Name[cs]=Démon upozorňování na média
+ Name[da]=Mediebekendtgørelsesdæmon
+ Name[de]=Gerätebenachrichtigung
+-Name[el]=Δαίμονας ειδοποίησης μέσου
+-Name[en_GB]=Media Notifier Daemon
+-Name[es]=Demonio de notificaciones de los medios
++Name[el]=Δαίμονας ειδοποίησης μέσων
++Name[es]=Demonio de notificaciones de medios
+ Name[et]=Andmekandjate märguannete deemon
+-Name[eu]=Euskarrien jakinarazpenak
+ Name[fi]=Mediahuomautin
+ Name[fr]=Démon de notifications des média
+ Name[fy]=Medianotifikaasje-daemon
+-Name[gl]=Demo de Notificazóns dos Meios
+-Name[hu]=Új lemezeket figyelő szolgáltatás
+-Name[is]=Miðil tilkynningarpúki
+-Name[it]=Demone notifiche dispositivi
+-Name[ja]=メディア Notifier デーモン
++Name[hu]=Lemezfigyelő szolgáltatás
++Name[is]=Miðils tilkynningarpúki
+ Name[lt]=Media pranešimų tarnyba
+-Name[mk]=Даемон за известување за медиуми
+-Name[nb]=Medievarslingsnisse
+-Name[nds]=Medien-Narichtendeenst
++Name[nds]=Medien-Narichtendämoon
+ Name[nl]=Medianotificatie-daemon
+-Name[nn]=Systempåminningsnisse
+-Name[pa]=ਮੀਡਿਆ ਸੂਚਨਾ ਡਾਈਮੋਨ
+-Name[pl]=Usługa powiadamiania o nośnikach
+ Name[pt]=Servidor de Notificação de Dispositivos
+-Name[pt_BR]=Serviço Notificador para Mídia
+-Name[ru]=Уведомления от подключаемых устройств
+-Name[se]=Vuogádatmuittuhusaid duogášprográmma
+-Name[sl]=Demon za obveščanje o nosilcih
+-Name[sr]=Демон за обавештења о медијумима
+-Name[sr at Latn]=Demon za obaveštenja o medijumima
++Name[pt_BR]=Servidor de Notificação de Dispositivos
+ Name[sv]=Demon för mediaunderrättelser
+-Name[th]=เดมอนแจ้งเตือนสำหรับสื่อบันทึก
+-Name[tr]=CD/USB/Firewire durum izleme sistemi
+-Name[tt]=Cıhaz Totaşılu Beldergeçe
+ Name[uk]=Даемон сповіщення про носії інформації
+-Name[uz]=Сақлаш ускуналар учун демон
+ Name[zh_CN]=介质通知守护程序
+-Name[zh_TW]=媒體通知伺服程式
+ Comment=A media plugged notifier
+ Comment[af]='n Inpropbare media inkennissteller
+ Comment[bg]=Мултимедиен демон за уведомяване при поставяне/включване на ново мултимедийно устройство
+--- kioslave/media/services/media_eject.desktop	(revision 488815)
++++ kioslave/media/services/media_eject.desktop	(revision 494868)
+@@ -27,7 +27,7 @@
+ Name[fa]=اخراج
+ Name[fi]=Poista
+ Name[fr]=Éjecter
+-Name[fy]=útsmytknop
++Name[fy]=Utsmytknop
+ Name[ga]=Díchuir
+ Name[gl]=Expulsar
+ Name[he]=הוצא
+--- kioslave/media/kcmodule/notifiermoduleview.ui	(revision 488815)
++++ kioslave/media/kcmodule/notifiermoduleview.ui	(revision 494868)
+@@ -61,7 +61,7 @@
+                                 </sizepolicy>
+                             </property>
+                             <property name="whatsThis" stdset="0">
+-                                <string>Here is the list of the availables type of medium which can be monitored. You can filter the available actions by selecting a kind of medium. If you want to see all the actions, select "All Mime Types".</string>
++                                <string>Here is the list of the available types of medium which can be monitored. You can filter the available actions by selecting a type of medium. If you want to see all the actions, select "All Mime Types".</string>
+                             </property>
+                         </widget>
+                     </hbox>
+@@ -123,7 +123,7 @@
+                                         <string>&amp;Toggle as Auto Action</string>
+                                     </property>
+                                     <property name="whatsThis" stdset="0">
+-                                        <string>Click here to perform automatically this action on detection of the selected medium type (this option is disabled when "All Mime Types" is selected).</string>
++                                        <string>Click here to perform this action automatically on detection of the selected medium type (this option is disabled when "All Mime Types" is selected).</string>
+                                     </property>
+                                 </widget>
+                             </vbox>
+--- kioslave/trash/trash.protocol	(revision 488815)
++++ kioslave/trash/trash.protocol	(revision 494868)
+@@ -50,7 +50,7 @@
+ ExtraNames[mk]=Оригинална патека,Датум на бришење
+ ExtraNames[nb]=Opprinnelig sti, slettedato
+ ExtraNames[nds]=Orginaalpadd,Löschdatum
+-ExtraNames[nl]=Oorspronkelijke locatie,datum van verwijdering
++ExtraNames[nl]=Oorspronkelijke locatie,Datum van verwijdering
+ ExtraNames[nn]=Opprinneleg stig, slettedato
+ ExtraNames[pa]=ਅਸਲੀ ਮਾਰਗ,ਹਟਾਉਣ ਮਿਤੀ
+ ExtraNames[pl]=Ścieżka oryginalna,Data usunięcia
+--- kioslave/trash/kfile-plugin/kfile_trash.desktop	(revision 488815)
++++ kioslave/trash/kfile-plugin/kfile_trash.desktop	(revision 494868)
+@@ -19,7 +19,7 @@
+ Name[eu]=Zakarontziaren infoa
+ Name[fi]=Roskakorin tiedot
+ Name[fr]=Info Fichier Corbeille
+-Name[fy]=Jiskefetynformaasje
++Name[fy]=Jiskefet ynformaasje
+ Name[gl]=Informazón do Lixo
+ Name[he]=מידע אודות קובץ אשפה
+ Name[hi]=रद्दी फ़ाइल जानकारी
+--- kioslave/trash/kfile-plugin/kfile_trash_system.desktop	(revision 488815)
++++ kioslave/trash/kfile-plugin/kfile_trash_system.desktop	(revision 494868)
+@@ -19,7 +19,7 @@
+ Name[eu]=Zakarontziaren infoa
+ Name[fi]=Roskakorin tiedot
+ Name[fr]=Info Fichier Corbeille
+-Name[fy]=Jiskefetynformaasje
++Name[fy]=Jiskefet ynformaasje
+ Name[gl]=Informazón do Lixo
+ Name[he]=מידע אודות קובץ אשפה
+ Name[hi]=रद्दी फ़ाइल जानकारी
+--- kioslave/thumbnail/cursorthumbnail.desktop	(revision 488815)
++++ kioslave/thumbnail/cursorthumbnail.desktop	(revision 494868)
+@@ -15,7 +15,7 @@
+ Name[cy]=Ffeiliau Cyrchydd
+ Name[da]=Markørfiler
+ Name[de]=Cursor-Dateien
+-Name[el]=Αρχεία κέρσορα
++Name[el]=Αρχεία δρομέα
+ Name[eo]=Tipardosierojn
+ Name[es]=Archivos de cursores
+ Name[et]=Kursorifailid
+--- kioslave/thumbnail/imagethumbnail.desktop	(revision 488815)
++++ kioslave/thumbnail/imagethumbnail.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Irudiak
+ Name[fa]=تصاویر
+ Name[fi]=Kuvat
+-Name[fy]=Ôfbyldings
++Name[fy]=Ofbyldings
+ Name[ga]=Íomhánna
+ Name[gl]=Imaxes
+ Name[he]=תמונות
+--- kioslave/thumbnail/thumbcreator.desktop	(revision 488815)
++++ kioslave/thumbnail/thumbcreator.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Comment[fa]=اداره کننده‌ی اثر انگشت
+ Comment[fi]=Esikatselukuvien hallinta
+ Comment[fr]=Gestionnaire d'aperçu des images
+-Comment[fy]=Miniôfbyldingsmakker
++Comment[fy]=Miniatueren ôfhanneler
+ Comment[ga]=Láimhseálaí na Mionsamhlacha
+ Comment[gl]=Manexador de Miniaturas
+ Comment[he]=מנהל הדוגמיות
+--- kioslave/nfs/nfs_prot_xdr.c	(revision 488815)
++++ kioslave/nfs/nfs_prot_xdr.c	(revision 494868)
+@@ -738,7 +738,7 @@
+ 	 if (!xdr_nfscookie(xdrs, objp->cookie)) {
+ 		 return (FALSE);
+ 	 }
+-	 if (!xdr_pointer(xdrs, (char **)&objp->nextentry, sizeof(entry), (xdrproc_t)xdr_entry)) {
++	 if (!xdr_pointer(xdrs, &objp->nextentry, sizeof(entry), (xdrproc_t)xdr_entry)) {
+ 		 return (FALSE);
+ 	 }
+ 	return (TRUE);
+--- kioslave/home/homeimpl.h	(revision 488815)
++++ kioslave/home/homeimpl.h	(revision 494868)
+@@ -13,8 +13,8 @@
+ 
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-   Boston, MA 02111-1307, USA.
++   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++   Boston, MA 02110-1301, USA.
+ */
+ 
+ #ifndef HOMEIMPL_H
+--- kioslave/home/kio_home.h	(revision 488815)
++++ kioslave/home/kio_home.h	(revision 494868)
+@@ -13,8 +13,8 @@
+ 
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-   Boston, MA 02111-1307, USA.
++   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++   Boston, MA 02110-1301, USA.
+ */
+ 
+ #ifndef KIO_HOME_H
+--- kioslave/home/testhome.cpp	(revision 488815)
++++ kioslave/home/testhome.cpp	(revision 494868)
+@@ -13,8 +13,8 @@
+ 
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-   Boston, MA 02111-1307, USA.
++   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++   Boston, MA 02110-1301, USA.
+ */
+ 
+ #include "kio_home.h"
+--- kioslave/home/homeimpl.cpp	(revision 488815)
++++ kioslave/home/homeimpl.cpp	(revision 494868)
+@@ -13,8 +13,8 @@
+ 
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-   Boston, MA 02111-1307, USA.
++   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++   Boston, MA 02110-1301, USA.
+ */
+ 
+ #include "homeimpl.h"
+--- kioslave/home/kio_home.cpp	(revision 488815)
++++ kioslave/home/kio_home.cpp	(revision 494868)
+@@ -13,8 +13,8 @@
+ 
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-   Boston, MA 02111-1307, USA.
++   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++   Boston, MA 02110-1301, USA.
+ */
+ 
+ #include <stdlib.h>
+--- kioslave/home/kdedmodule/homedirnotify.cpp	(revision 488815)
++++ kioslave/home/kdedmodule/homedirnotify.cpp	(revision 494868)
+@@ -12,8 +12,8 @@
+ 
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-   Boston, MA 02111-1307, USA.
++   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++   Boston, MA 02110-1301, USA.
+ */
+ 
+ #include "homedirnotify.h"
+--- kioslave/home/kdedmodule/homedirnotify.h	(revision 488815)
++++ kioslave/home/kdedmodule/homedirnotify.h	(revision 494868)
+@@ -12,8 +12,8 @@
+ 
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-   Boston, MA 02111-1307, USA.
++   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++   Boston, MA 02110-1301, USA.
+ */
+ 
+ #ifndef HOMEDIRNOTIFY_H
+--- kioslave/home/kdedmodule/homedirnotifymodule.cpp	(revision 488815)
++++ kioslave/home/kdedmodule/homedirnotifymodule.cpp	(revision 494868)
+@@ -12,8 +12,8 @@
+ 
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-   Boston, MA 02111-1307, USA.
++   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++   Boston, MA 02110-1301, USA.
+ */
+ 
+ #include "homedirnotifymodule.h"
+--- kioslave/home/kdedmodule/homedirnotifymodule.h	(revision 488815)
++++ kioslave/home/kdedmodule/homedirnotifymodule.h	(revision 494868)
+@@ -12,8 +12,8 @@
+ 
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-   Boston, MA 02111-1307, USA.
++   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++   Boston, MA 02110-1301, USA.
+ */
+ 
+ #ifndef HOMEDIRNOTIFYMODULE_H
+--- kioslave/home/testhome.h	(revision 488815)
++++ kioslave/home/testhome.h	(revision 494868)
+@@ -13,8 +13,8 @@
+ 
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-   Boston, MA 02111-1307, USA.
++   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++   Boston, MA 02110-1301, USA.
+ */
+ 
+ #ifndef TESTHOME_H
+--- kioslave/fish/fish.cpp	(revision 488815)
++++ kioslave/fish/fish.cpp	(revision 494868)
+@@ -529,9 +529,11 @@
+ */
+ void fishProtocol::writeChild(const char *buf, int len) {
+     if (outBufPos >= 0 && outBuf) {
++#if 0
+         QString debug;
+         debug.setLatin1(outBuf,outBufLen);
+         if (len > 0) myDebug( << "write request while old one is pending, throwing away input (" << outBufLen << "," << outBufPos << "," << debug.left(10) << "...)" << endl);
++#endif
+         return;
+     }
+     outBuf = buf;
+@@ -1373,9 +1375,11 @@
+                 return;
+             }
+             if (FD_ISSET(childFd,&wfds) && outBufPos >= 0) {
++#if 0
+                 QString debug;
+                 debug.setLatin1(outBuf+outBufPos,outBufLen-outBufPos);
+                 myDebug( << "now writing " << (outBufLen-outBufPos) << " " << debug.left(40) << "..." << endl);
++#endif
+                 if (outBufLen-outBufPos > 0) rc = write(childFd,outBuf+outBufPos,outBufLen-outBufPos);
+                 else rc = 0;
+                 if (rc >= 0) outBufPos += rc;
+--- kioslave/man/man2html.cpp	(revision 488815)
++++ kioslave/man/man2html.cpp	(revision 494868)
+@@ -3861,8 +3861,14 @@
+                     /* somewhere a definition ends with '.TP' */
+                     if (!*c)
+                         still_dd=true;
+-                    else
++                    else 
+                     {
++                        // HACK for proc(5)
++                        while (c[0]=='.' && c[1]=='\\' && c[2]=='\"')
++                        {
++                            // We have a comment, so skip the line
++                            c=skip_till_newline(c);
++                        }
+                         c=scan_troff(c,1,NULL);
+                         out_html("<DD>");
+                     }
+--- kdeprint/printmgr/printmgr.desktop	(revision 488815)
++++ kdeprint/printmgr/printmgr.desktop	(revision 494868)
+@@ -34,7 +34,7 @@
+ Name[fa]=مدیر چاپ
+ Name[fi]=Tulostuksenhallinta
+ Name[fr]=Gestionnaire d'impression
+-Name[fy]=Afdrukbehear
++Name[fy]=Printbehear
+ Name[ga]=Bainisteoir Priontála
+ Name[gl]=Xestor de Impresión
+ Name[he]=מנהל ההדפסה
+@@ -106,7 +106,7 @@
+ Comment[fa]=تنظیمات سیستم چاپ چاپگرها,کارها,کلاسها وغیره
+ Comment[fi]=Tulostusjärjestelmän asetukset (tulostimet, työt, luokat, ...)
+ Comment[fr]=Configuration du système d'impression (imprimantes, travaux d'impression, classes...)
+-Comment[fy]=Ynstellings fan it ôfdruksysteem (printers, taken, klassen, ...)
++Comment[fy]=Ynstellings fan it printsysteem (printers, taken, klassen, ...)
+ Comment[gl]=Configurazón do sistema de Impresión (impresoras, traballos, clases, ...)
+ Comment[he]=שינוי הגדרות מערכת ההדפסה (מדפסות, עבודות, מחלקות...)
+ Comment[hi]=प्रिंटर तंत्र कॉन्फ़िगरेशन (प्रिंटर,कार्य,क्लासेस...)
+@@ -174,7 +174,7 @@
+ Keywords[fa]=print,printer,printing management,چاپ,چاپگر
+ Keywords[fi]=tulostus,tulostin,tulostuksenhallinta
+ Keywords[fr]=impression,imprimante,système d'impression
+-Keywords[fy]=print,printer,printing management,ôfdrukbehear,ôfdrukke
++Keywords[fy]=print,printer,printing management,printbehear,printsje
+ Keywords[ga]=priontáil,printéir,bainistíocht priontála
+ Keywords[gl]=imprimir,impresora,xestión de impresión
+ Keywords[he]=הדפסה,מדפסת,ניהול הדפסה, print,printer,printing management
+--- kdeprint/printmgr/printers.desktop	(revision 488815)
++++ kdeprint/printmgr/printers.desktop	(revision 494868)
+@@ -101,7 +101,7 @@
+ Comment[fa]=تنظیمات سیستم چاپ چاپگرها,کارها,کلاسها وغیره
+ Comment[fi]=Tulostusjärjestelmän asetukset (tulostimet, työt, luokat, ...)
+ Comment[fr]=Configuration du système d'impression (imprimantes, travaux d'impression, classes...)
+-Comment[fy]=Ynstellings fan it ôfdruksysteem (printers, taken, klassen, ...)
++Comment[fy]=Ynstellings fan it printsysteem (printers, taken, klassen, ...)
+ Comment[gl]=Configurazón do sistema de Impresión (impresoras, traballos, clases, ...)
+ Comment[he]=שינוי הגדרות מערכת ההדפסה (מדפסות, עבודות, מחלקות...)
+ Comment[hi]=प्रिंटर तंत्र कॉन्फ़िगरेशन (प्रिंटर,कार्य,क्लासेस...)
+@@ -169,7 +169,7 @@
+ Keywords[fa]=print,printer,printing management,چاپ,چاپگر
+ Keywords[fi]=tulostus,tulostin,tulostuksenhallinta
+ Keywords[fr]=impression,imprimante,système d'impression
+-Keywords[fy]=print,printer,printing management,ôfdrukbehear,ôfdrukke
++Keywords[fy]=print,printer,printing management,printbehear,printsje
+ Keywords[ga]=priontáil,printéir,bainistíocht priontála
+ Keywords[gl]=imprimir,impresora,xestión de impresión
+ Keywords[he]=הדפסה,מדפסת,ניהול הדפסה, print,printer,printing management
+--- kdeprint/kdeprint_part/kdeprint_part.desktop	(revision 488815)
++++ kdeprint/kdeprint_part/kdeprint_part.desktop	(revision 494868)
+@@ -23,7 +23,7 @@
+ Name[fa]=ابزار مدیریت چاپ
+ Name[fi]=Tulostuksenhallinta
+ Name[fr]=Gestionnaire d'impression
+-Name[fy]=Helpprogramma foar ôfdrukbehear
++Name[fy]=Helpprogramma foar printbehear
+ Name[ga]=Uirlis Bhainistíocht Priontála
+ Name[gl]=Ferramenta de Xestión da Impresión
+ Name[he]=כלי ניהול הדפסה
+--- kdeprint/kjobviewer/kjobviewer.desktop	(revision 488815)
++++ kdeprint/kjobviewer/kjobviewer.desktop	(revision 494868)
+@@ -33,7 +33,7 @@
+ GenericName[eu]=Inprimaketa lanak
+ GenericName[fi]=Tulostustyöt
+ GenericName[fr]=Tâches d'impressions
+-GenericName[fy]=Ofdruktaken
++GenericName[fy]=printtaken
+ GenericName[ga]=Jabanna Priontála
+ GenericName[gl]=Traballos de Impresión
+ GenericName[he]=עבודות הדפסה
+--- kdeprint/slave/mimetypes/driver.desktop	(revision 488815)
++++ kdeprint/slave/mimetypes/driver.desktop	(revision 494868)
+@@ -18,7 +18,7 @@
+ Comment[eu]=Inprimagailuaren driverra
+ Comment[fi]=Tulostinajuri
+ Comment[fr]=Pilote d'imprimante
+-Comment[fy]=Printerstuurprogramma
++Comment[fy]=Printerstjoerprogramma
+ Comment[ga]=Tiománaí Printéara
+ Comment[gl]=Controlador da Impresora
+ Comment[he]=מנהל התקן המדפסת
+--- kdeprint/slave/mimetypes/folder.desktop	(revision 488815)
++++ kdeprint/slave/mimetypes/folder.desktop	(revision 494868)
+@@ -16,7 +16,7 @@
+ Comment[eu]=Inprimaketa karpeta
+ Comment[fi]=Tulostuskansio
+ Comment[fr]=Dossier d'impression
+-Comment[fy]=Ofdrukmap
++Comment[fy]=printmap
+ Comment[ga]=Fillteán Priontála
+ Comment[gl]=Cartafol de Impresión
+ Comment[he]=תיקיית הדפסה
+--- kdeprint/slave/mimetypes/jobs.desktop	(revision 488815)
++++ kdeprint/slave/mimetypes/jobs.desktop	(revision 494868)
+@@ -20,7 +20,7 @@
+ Comment[fa]=چاپ‌ها
+ Comment[fi]=Tulostustyöt
+ Comment[fr]=Tâches d'impression
+-Comment[fy]=Afdruktaken
++Comment[fy]=Printtaken
+ Comment[ga]=Jabanna Priontála
+ Comment[gl]=Traballos de Impresión
+ Comment[he]=עבודות הדפסה
+--- kdeprint/kprinter/kprinter.desktop	(revision 488815)
++++ kdeprint/kprinter/kprinter.desktop	(revision 494868)
+@@ -48,7 +48,7 @@
+ GenericName[fa]=ابزار چاپ
+ GenericName[fi]=Tulostustyökalu
+ GenericName[fr]=Outil d'impression
+-GenericName[fy]=Ofdrukprogramma
++GenericName[fy]=printprogramma
+ GenericName[ga]=Uirlis Priontála
+ GenericName[gl]=Ferramenta de Impresión
+ GenericName[he]=כלי הדפסה
+--- nsplugins/khtml_plugins.desktop	(revision 488815)
++++ nsplugins/khtml_plugins.desktop	(revision 494868)
+@@ -99,7 +99,7 @@
+ Comment[fa]=تنظیم متصل‌کننده‌های مرورگر
+ Comment[fi]=Muokkaa selaimen liitännäisasetuksia
+ Comment[fr]=Configuration des modules externes du navigateur
+-Comment[fy]=Hjir kinst dyn blêdzjer-plugins ynstelle
++Comment[fy]=Hjir kinne jo de blêder-plugins ynstelle
+ Comment[ga]=Cumraigh na Breiseáin Brabhsálaithe
+ Comment[gl]=Configurar os plugins do navegador
+ Comment[he]=שינוי הגדרות התוספים של הדפדפן
+@@ -167,7 +167,7 @@
+ Keywords[fa]=konqueror,kfm,browser,html,web,www,fonts,plugins,متصل,کانکرر,قلم,خط
+ Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,liitännäiset
+ Keywords[fr]=konqueror,kfm,navigateur,html,web,www,polices,plugins,modules externes
+-Keywords[fy]=konqueror,kfm,browser,blêdzjer,html,web,www,fonts,lettertypen,plugins,internet,ynternet,netscape plugins
++Keywords[fy]=konqueror,kfm,browser,blêder,html,web,www,fonts,lettertypen,plugins,internet,ynternet,netscape plugins
+ Keywords[ga]=konqueror,kfm,brabhsálaí,html,idirlíon,www,clófhoirne,breiseáin
+ Keywords[gl]=konqueror,kfm,navegador,html,web,www,fontes,plugins
+ Keywords[he]=konqueror,kfm,דפדפן,html,web,www,אינטרנט,גופנים,תוספים, fonts,plugins
+--- nsplugins/viewer/viewer.cpp	(revision 488815)
++++ nsplugins/viewer/viewer.cpp	(revision 494868)
+@@ -54,7 +54,14 @@
+ #include "qxteventloop.h"
+ #endif
+ 
++/**
++ *  Use RLIMIT_DATA on systems that don't define RLIMIT_AS,
++ *  such as FreeBSD 4.
++ */
+ 
++#ifndef RLIMIT_AS
++#define RLIMIT_AS RLIMIT_DATA
++#endif
+ 
+ /**
+  * The error handler catches all X errors, writes the error
+--- kappfinder/apps/Graphics/blender.desktop	(revision 488815)
++++ kappfinder/apps/Graphics/blender.desktop	(revision 494868)
+@@ -46,6 +46,7 @@
+ GenericName[it]=Modellatore e render 3D
+ GenericName[ja]=3D モデラ/レンダラ
+ GenericName[ko]=3차원 모델링/렌더링 도구
++GenericName[lt]=3D modeliavimo/atvaizdavimo priemonÄ—
+ GenericName[lv]=3D Scēnu Modelētājs
+ GenericName[mk]=3D Моделирач/Исцртувач
+ GenericName[mn]=3 хэмжээст дүр зураг загварчилагч
+--- kappfinder/apps/Graphics/GnomeIconEditor.desktop	(revision 488815)
++++ kappfinder/apps/Graphics/GnomeIconEditor.desktop	(revision 494868)
+@@ -21,7 +21,7 @@
+ Name[fa]=ویرایشگر شمایل گنوم
+ Name[fi]=Gnomen kuvakemuokkain
+ Name[fr]=Gnome IconEditor
+-Name[fy]=GNOME Ikoan Bewurker
++Name[fy]=GNOME byldkaike bewurker
+ Name[ga]=Eagarthóir Deilbhíní GNOME
+ Name[gl]=Editor de Ícones de Gnome
+ Name[hi]=ग्नोम प्रतीक संपादक
+--- kappfinder/apps/Graphics/Gqview.desktop	(revision 488815)
++++ kappfinder/apps/Graphics/Gqview.desktop	(revision 494868)
+@@ -34,7 +34,7 @@
+ GenericName[fi]=Kuvaselain
+ GenericName[fo]=Myndakagari
+ GenericName[fr]=Afficheur d'images
+-GenericName[fy]=Ofbyldingsblêdzjer
++GenericName[fy]=Ofbyldingsblêder
+ GenericName[ga]=Brabhsálaí Íomhánna
+ GenericName[gl]=Navegador de Imaxes
+ GenericName[he]=דפדפן תמונות
+--- kappfinder/apps/Development/assistant.desktop	(revision 488815)
++++ kappfinder/apps/Development/assistant.desktop	(revision 494868)
+@@ -76,7 +76,7 @@
+ GenericName[fi]=Asiakirjaselain
+ GenericName[fo]=Skjalakagari
+ GenericName[fr]=Explorateur de documentation Qt
+-GenericName[fy]=Dokumintblêdzjer
++GenericName[fy]=Dokumintblêder
+ GenericName[ga]=Brabhsálaí Cáipéise
+ GenericName[gl]=Navedador de Documentos
+ GenericName[he]=דפדפן מסמכים
+--- kappfinder/apps/Development/ddd.desktop	(revision 488815)
++++ kappfinder/apps/Development/ddd.desktop	(revision 494868)
+@@ -50,7 +50,7 @@
+ GenericName[th]=เครื่องมือดีบักการแสดงข้อมูล
+ GenericName[tr]=Veri Gösterim Hata Ayıklayıcısı
+ GenericName[tt]=Täräzäle Betçe (DDD)
+-GenericName[uk]=Зневаджувач "Data Display Debugger"
++GenericName[uk]=Зневадник "Data Display Debugger"
+ GenericName[ven]=Debugger i no sumbedza mafhungo (Data)
+ GenericName[vi]= Trình gỡ rối hiển tị dữ liệu 
+ GenericName[wa]=Disbugueu DDD
+--- kappfinder/apps/Internet/mozilla.desktop	(revision 488815)
++++ kappfinder/apps/Internet/mozilla.desktop	(revision 494868)
+@@ -37,7 +37,7 @@
+ GenericName[fi]=WWW-selain
+ GenericName[fo]=Alnótsfar
+ GenericName[fr]=Navigateur web
+-GenericName[fy]=Webblêdzjer
++GenericName[fy]=Webblêder
+ GenericName[ga]=Brabhsálaí Lín
+ GenericName[gl]=Navegador Web
+ GenericName[he]=דפדפן אינטרנט
+--- kappfinder/apps/Internet/Sylpheed.desktop	(revision 488815)
++++ kappfinder/apps/Internet/Sylpheed.desktop	(revision 494868)
+@@ -30,7 +30,7 @@
+ GenericName[fi]=Sähköpostiohjelma
+ GenericName[fo]=Postforrit
+ GenericName[fr]=Logiciel de messagerie électronique
+-GenericName[fy]=E-postklant
++GenericName[fy]=E-post programma
+ GenericName[ga]=Cliant Ríomhphoist
+ GenericName[gl]=Cliente de correo
+ GenericName[he]=תוכנית דואר
+--- kappfinder/apps/Internet/mozilla-thunderbird.desktop	(revision 488815)
++++ kappfinder/apps/Internet/mozilla-thunderbird.desktop	(revision 494868)
+@@ -35,7 +35,7 @@
+ GenericName[fi]=Sähköpostiohjelma
+ GenericName[fo]=Postforrit
+ GenericName[fr]=Logiciel de messagerie électronique
+-GenericName[fy]=E-postklant
++GenericName[fy]=E-post programma
+ GenericName[ga]=Cliant Ríomhphoist
+ GenericName[gl]=Cliente de correo
+ GenericName[he]=תוכנית דואר
+--- kappfinder/apps/Internet/xfmail.desktop	(revision 488815)
++++ kappfinder/apps/Internet/xfmail.desktop	(revision 494868)
+@@ -41,7 +41,7 @@
+ GenericName[fi]=Sähköpostiohjelma
+ GenericName[fo]=Postforrit
+ GenericName[fr]=Logiciel de messagerie électronique
+-GenericName[fy]=E-postklant
++GenericName[fy]=E-post programma
+ GenericName[ga]=Cliant Ríomhphoist
+ GenericName[gl]=Cliente de correo
+ GenericName[he]=תוכנית דואר
+--- kappfinder/apps/Internet/xftp.desktop	(revision 488815)
++++ kappfinder/apps/Internet/xftp.desktop	(revision 494868)
+@@ -29,7 +29,7 @@
+ GenericName[eu]=FTP arakatzailea
+ GenericName[fi]=FTP-selain
+ GenericName[fr]=Navigateur FTP
+-GenericName[fy]=FTP-blêdzjer
++GenericName[fy]=FTP-blêder
+ GenericName[ga]=Brabhsálaí FTP
+ GenericName[gl]=Navegador FTP
+ GenericName[he]=דפדפן FTP
+--- kappfinder/apps/Internet/balsa.desktop	(revision 488815)
++++ kappfinder/apps/Internet/balsa.desktop	(revision 494868)
+@@ -33,7 +33,7 @@
+ GenericName[fi]=Sähköpostiohjelma
+ GenericName[fo]=Postforrit
+ GenericName[fr]=Logiciel de messagerie électronique
+-GenericName[fy]=E-postklant
++GenericName[fy]=E-post programma
+ GenericName[ga]=Cliant Ríomhphoist
+ GenericName[gl]=Cliente de correo
+ GenericName[he]=תוכנית דואר
+--- kappfinder/apps/Internet/arena.desktop	(revision 488815)
++++ kappfinder/apps/Internet/arena.desktop	(revision 494868)
+@@ -41,7 +41,7 @@
+ GenericName[fi]=WWW-selain
+ GenericName[fo]=Alnótsfar
+ GenericName[fr]=Navigateur web
+-GenericName[fy]=Webblêdzjer
++GenericName[fy]=Webblêder
+ GenericName[ga]=Brabhsálaí Lín
+ GenericName[gl]=Navegador Web
+ GenericName[he]=דפדפן אינטרנט
+--- kappfinder/apps/Internet/netscape6.desktop	(revision 488815)
++++ kappfinder/apps/Internet/netscape6.desktop	(revision 494868)
+@@ -48,7 +48,7 @@
+ GenericName[fi]=WWW-selain
+ GenericName[fo]=Alnótsfar
+ GenericName[fr]=Navigateur web
+-GenericName[fy]=Webblêdzjer
++GenericName[fy]=Webblêder
+ GenericName[ga]=Brabhsálaí Lín
+ GenericName[gl]=Navegador Web
+ GenericName[he]=דפדפן אינטרנט
+--- kappfinder/apps/Internet/Dpsftp.desktop	(revision 488815)
++++ kappfinder/apps/Internet/Dpsftp.desktop	(revision 494868)
+@@ -20,7 +20,7 @@
+ GenericName[eu]=FTP arakatzailea
+ GenericName[fi]=FTP-selain
+ GenericName[fr]=Navigateur FTP
+-GenericName[fy]=FTP-blêdzjer
++GenericName[fy]=FTP-blêder
+ GenericName[ga]=Brabhsálaí FTP
+ GenericName[gl]=Navegador FTP
+ GenericName[he]=דפדפן FTP
+--- kappfinder/apps/Internet/gtelnet.desktop	(revision 488815)
++++ kappfinder/apps/Internet/gtelnet.desktop	(revision 494868)
+@@ -6,6 +6,7 @@
+ Name[cs]=Gnome Telnet
+ Name[eo]=Gnoma telneto
+ Name[fa]=تل‌نت گنوم
++Name[fi]=Gnome Telnet
+ Name[fr]=Gnome Telnet
+ Name[hi]=ग्नोम टेलनेट
+ Name[it]=Telnet di GNOME
+--- kappfinder/apps/Internet/Galeon.desktop	(revision 488815)
++++ kappfinder/apps/Internet/Galeon.desktop	(revision 494868)
+@@ -32,7 +32,7 @@
+ GenericName[fi]=WWW-selain
+ GenericName[fo]=Alnótsfar
+ GenericName[fr]=Navigateur web
+-GenericName[fy]=Webblêdzjer
++GenericName[fy]=Webblêder
+ GenericName[ga]=Brabhsálaí Lín
+ GenericName[gl]=Navegador Web
+ GenericName[he]=דפדפן אינטרנט
+--- kappfinder/apps/Internet/opera.desktop	(revision 488815)
++++ kappfinder/apps/Internet/opera.desktop	(revision 494868)
+@@ -33,7 +33,7 @@
+ GenericName[fi]=WWW-selain
+ GenericName[fo]=Alnótsfar
+ GenericName[fr]=Navigateur web
+-GenericName[fy]=Webblêdzjer
++GenericName[fy]=Webblêder
+ GenericName[ga]=Brabhsálaí Lín
+ GenericName[gl]=Navegador Web
+ GenericName[he]=דפדפן אינטרנט
+--- kappfinder/apps/Internet/mozilla-firefox.desktop	(revision 488815)
++++ kappfinder/apps/Internet/mozilla-firefox.desktop	(revision 494868)
+@@ -34,7 +34,7 @@
+ GenericName[fi]=WWW-selain
+ GenericName[fo]=Alnótsfar
+ GenericName[fr]=Navigateur web
+-GenericName[fy]=Webblêdzjer
++GenericName[fy]=Webblêder
+ GenericName[ga]=Brabhsálaí Lín
+ GenericName[gl]=Navegador Web
+ GenericName[he]=דפדפן אינטרנט
+--- kappfinder/apps/Internet/Netscapemessenger.desktop	(revision 488815)
++++ kappfinder/apps/Internet/Netscapemessenger.desktop	(revision 494868)
+@@ -49,7 +49,7 @@
+ GenericName[fi]=Sähköpostiohjelma
+ GenericName[fo]=Postforrit
+ GenericName[fr]=Logiciel de messagerie électronique
+-GenericName[fy]=E-postklant
++GenericName[fy]=E-post programma
+ GenericName[ga]=Cliant Ríomhphoist
+ GenericName[gl]=Cliente de correo
+ GenericName[he]=תוכנית דואר
+--- kappfinder/apps/Internet/epiphany.desktop	(revision 488815)
++++ kappfinder/apps/Internet/epiphany.desktop	(revision 494868)
+@@ -33,7 +33,7 @@
+ GenericName[fi]=WWW-selain
+ GenericName[fo]=Alnótsfar
+ GenericName[fr]=Navigateur web
+-GenericName[fy]=Webblêdzjer
++GenericName[fy]=Webblêder
+ GenericName[ga]=Brabhsálaí Lín
+ GenericName[gl]=Navegador Web
+ GenericName[he]=דפדפן אינטרנט
+--- kappfinder/apps/Internet/DrakSync.desktop	(revision 488815)
++++ kappfinder/apps/Internet/DrakSync.desktop	(revision 494868)
+@@ -24,7 +24,7 @@
+ GenericName[eu]=Karpeta sinkronizatzea
+ GenericName[fi]=Kansioiden synkronointityökalu
+ GenericName[fr]=Synchronisation de dossiers
+-GenericName[fy]=Mappensyngronisaasje
++GenericName[fy]=Mappen syngronisaasje
+ GenericName[ga]=Sioncrónú Fillteán
+ GenericName[gl]=Sincronizazón de Cartafois
+ GenericName[he]=סנכרון תיקיות
+--- kappfinder/apps/Internet/gnometalk.desktop	(revision 488815)
++++ kappfinder/apps/Internet/gnometalk.desktop	(revision 494868)
+@@ -7,6 +7,7 @@
+ Name[cs]=Gnome Talk
+ Name[eo]=Gnoma babililo
+ Name[fa]=گفتگوی گنوم
++Name[fi]=Gnome Talk
+ Name[fr]=Gnome Talk
+ Name[hi]=ग्नोम टाक
+ Name[it]=Talk di GNOME
+--- kappfinder/apps/Internet/Evolution.desktop	(revision 488815)
++++ kappfinder/apps/Internet/Evolution.desktop	(revision 494868)
+@@ -39,7 +39,7 @@
+ GenericName[fi]=Sähköpostiohjelma
+ GenericName[fo]=Postforrit
+ GenericName[fr]=Logiciel de messagerie électronique
+-GenericName[fy]=E-postklant
++GenericName[fy]=E-post programma
+ GenericName[ga]=Cliant Ríomhphoist
+ GenericName[gl]=Cliente de correo
+ GenericName[he]=תוכנית דואר
+--- kappfinder/apps/Internet/gFTP.desktop	(revision 488815)
++++ kappfinder/apps/Internet/gFTP.desktop	(revision 494868)
+@@ -20,7 +20,7 @@
+ GenericName[eu]=FTP arakatzailea
+ GenericName[fi]=FTP-selain
+ GenericName[fr]=Navigateur FTP
+-GenericName[fy]=FTP-blêdzjer
++GenericName[fy]=FTP-blêder
+ GenericName[ga]=Brabhsálaí FTP
+ GenericName[gl]=Navegador FTP
+ GenericName[he]=דפדפן FTP
+--- kappfinder/apps/Internet/netscape.desktop	(revision 488815)
++++ kappfinder/apps/Internet/netscape.desktop	(revision 494868)
+@@ -38,7 +38,7 @@
+ GenericName[fi]=WWW-selain
+ GenericName[fo]=Alnótsfar
+ GenericName[fr]=Navigateur web
+-GenericName[fy]=Webblêdzjer
++GenericName[fy]=Webblêder
+ GenericName[ga]=Brabhsálaí Lín
+ GenericName[gl]=Navegador Web
+ GenericName[he]=דפדפן אינטרנט
+--- kappfinder/apps/Internet/Terminal/mutt.desktop	(revision 488815)
++++ kappfinder/apps/Internet/Terminal/mutt.desktop	(revision 494868)
+@@ -34,7 +34,7 @@
+ GenericName[fi]=Sähköpostiohjelma
+ GenericName[fo]=Postforrit
+ GenericName[fr]=Logiciel de messagerie électronique
+-GenericName[fy]=E-postklant
++GenericName[fy]=E-post programma
+ GenericName[ga]=Cliant Ríomhphoist
+ GenericName[gl]=Cliente de correo
+ GenericName[he]=תוכנית דואר
+--- kappfinder/apps/Internet/Terminal/Lynx.desktop	(revision 488815)
++++ kappfinder/apps/Internet/Terminal/Lynx.desktop	(revision 494868)
+@@ -28,7 +28,7 @@
+ GenericName[fi]=WWW-selain
+ GenericName[fo]=Alnótsfar
+ GenericName[fr]=Navigateur web
+-GenericName[fy]=Webblêdzjer
++GenericName[fy]=Webblêder
+ GenericName[ga]=Brabhsálaí Lín
+ GenericName[gl]=Navegador Web
+ GenericName[he]=דפדפן אינטרנט
+--- kappfinder/apps/Internet/Terminal/pine.desktop	(revision 488815)
++++ kappfinder/apps/Internet/Terminal/pine.desktop	(revision 494868)
+@@ -38,7 +38,7 @@
+ GenericName[fi]=Sähköpostiohjelma
+ GenericName[fo]=Postforrit
+ GenericName[fr]=Logiciel de messagerie électronique
+-GenericName[fy]=E-postklant
++GenericName[fy]=E-post programma
+ GenericName[ga]=Cliant Ríomhphoist
+ GenericName[gl]=Cliente de correo
+ GenericName[he]=תוכנית דואר
+--- kappfinder/apps/Internet/Terminal/Links.desktop	(revision 488815)
++++ kappfinder/apps/Internet/Terminal/Links.desktop	(revision 494868)
+@@ -41,7 +41,7 @@
+ GenericName[fi]=WWW-selain
+ GenericName[fo]=Alnótsfar
+ GenericName[fr]=Navigateur web
+-GenericName[fy]=Webblêdzjer
++GenericName[fy]=Webblêder
+ GenericName[ga]=Brabhsálaí Lín
+ GenericName[gl]=Navegador Web
+ GenericName[he]=דפדפן אינטרנט
+--- kappfinder/apps/Internet/Terminal/w3m.desktop	(revision 488815)
++++ kappfinder/apps/Internet/Terminal/w3m.desktop	(revision 494868)
+@@ -28,7 +28,7 @@
+ GenericName[fi]=WWW-selain
+ GenericName[fo]=Alnótsfar
+ GenericName[fr]=Navigateur web
+-GenericName[fy]=Webblêdzjer
++GenericName[fy]=Webblêder
+ GenericName[ga]=Brabhsálaí Lín
+ GenericName[gl]=Navegador Web
+ GenericName[he]=דפדפן אינטרנט
+--- kappfinder/apps/Games/Arcade/Gnibbles.desktop	(revision 488815)
++++ kappfinder/apps/Games/Arcade/Gnibbles.desktop	(revision 494868)
+@@ -32,7 +32,7 @@
+ GenericName[et]=GNOME Nibbles mäng
+ GenericName[eu]=GNOME Nibbles jokoa
+ GenericName[fa]=بازی نیبلز گنوم
+-GenericName[fi]=GNOME Nibbles peli
++GenericName[fi]=Gnome Nibbles -peli
+ GenericName[fo]=GNOME Nibble Spæl
+ GenericName[fr]=Jeu Nibbles pour Gnome
+ GenericName[fy]=GNOME Nibbles Spul
+--- kdesktop/kdesktopSetAsBackground.desktop	(revision 488815)
++++ kdesktop/kdesktopSetAsBackground.desktop	(revision 494868)
+@@ -124,7 +124,7 @@
+ Name[eu]=Mosaikoa
+ Name[fi]=Vierekkäin
+ Name[fr]=Mosaïque
+-Name[fy]=Tegels
++Name[fy]=Tegele
+ Name[ga]=Tilithe
+ Name[gl]=Mosaico
+ Name[he]=פרוש
+--- kdesktop/kdesktop.kcfg	(revision 488815)
++++ kdesktop/kdesktop.kcfg	(revision 494868)
+@@ -19,7 +19,7 @@
+     <entry key="DrawBackgroundPerScreen" type="Bool">
+        <default>false</default>
+        <label>Draw backgrounds per screen</label>
+-       <whatsthis>If you want to draw to each screen seperately in xinerama mode enable this option.</whatsthis>
++       <whatsthis>If you want to draw to each screen separately in xinerama mode enable this option.</whatsthis>
+     </entry>
+     <entry key="LimitCache" type="Bool">
+       <default>true</default>
+--- kdesktop/init/directory.trash	(revision 488815)
++++ kdesktop/init/directory.trash	(revision 494868)
+@@ -99,7 +99,7 @@
+ Comment[fa]=شامل پرونده‌های پاک شده است
+ Comment[fi]=Sisältää poistettuja tiedostoja
+ Comment[fr]=Contient les fichiers supprimés
+-Comment[fy]=Befet skraste triemen
++Comment[fy]=Befettet skraste triemen
+ Comment[gl]=Contén arquivos borrados
+ Comment[he]=מכילה קבצים שהוסרו
+ Comment[hi]=मिटाई गई फ़ाइलों को रखता है
+@@ -146,3 +146,4 @@
+ Comment[zh_CN]=保存临时删除的文件
+ Comment[zh_TW]=包含刪除的檔案
+ Comment[zu]=Iqukethe amafayela agudluziwe
++OnlyShowIn=KDE
+--- kdesktop/init/Templates/linkDVDROM.desktop	(revision 488815)
++++ kdesktop/init/Templates/linkDVDROM.desktop	(revision 494868)
+@@ -21,7 +21,7 @@
+ Name[fa]=دستگاه DVD-ROM...
+ Name[fi]=DVD-ROM-laite
+ Name[fr]=Lecteur de DVD-ROM...
+-Name[fy]=dûbelskiifstasjon
++Name[fy]=Dûbelskiifstasjon
+ Name[ga]=Gléas DVD-ROM...
+ Name[gl]=Dispositivo DVD-ROM...
+ Name[he]=התקן DVD...
+--- kdesktop/init/Templates/linkHD.desktop	(revision 488815)
++++ kdesktop/init/Templates/linkHD.desktop	(revision 494868)
+@@ -20,7 +20,7 @@
+ Name[fa]=دستگاه دیسک سخت...
+ Name[fi]=Kiintolevy...
+ Name[fr]=Disque dur...
+-Name[fy]=fêste skiif... 
++Name[fy]=Fêste skiif... 
+ Name[ga]=Gléas Diosca Crua...
+ Name[gl]=Dispositivo de Disco Duro...
+ Name[he]=התקן כונן קשיח...
+--- kdesktop/init/Templates/CDWRITER-Device.desktop	(revision 488815)
++++ kdesktop/init/Templates/CDWRITER-Device.desktop	(revision 494868)
+@@ -31,7 +31,7 @@
+ Name[fa]=اخراج
+ Name[fi]=Poista
+ Name[fr]=Éjecter
+-Name[fy]=útsmytknop
++Name[fy]=Utsmytknop
+ Name[ga]=Díchuir
+ Name[gl]=Expulsar
+ Name[he]=הוצא
+--- kdesktop/init/Templates/DVDROM-Device.desktop	(revision 488815)
++++ kdesktop/init/Templates/DVDROM-Device.desktop	(revision 494868)
+@@ -31,7 +31,7 @@
+ Name[fa]=اخراج
+ Name[fi]=Poista
+ Name[fr]=Éjecter
+-Name[fy]=útsmytknop
++Name[fy]=Utsmytknop
+ Name[ga]=Díchuir
+ Name[gl]=Expulsar
+ Name[he]=הוצא
+--- kdesktop/init/Templates/ZIP-Device.desktop	(revision 488815)
++++ kdesktop/init/Templates/ZIP-Device.desktop	(revision 494868)
+@@ -31,7 +31,7 @@
+ Name[fa]=اخراج
+ Name[fi]=Poista
+ Name[fr]=Éjecter
+-Name[fy]=útsmytknop
++Name[fy]=Utsmytknop
+ Name[ga]=Díchuir
+ Name[gl]=Expulsar
+ Name[he]=הוצא
+--- kdesktop/init/Templates/CDROM-Device.desktop	(revision 488815)
++++ kdesktop/init/Templates/CDROM-Device.desktop	(revision 494868)
+@@ -31,7 +31,7 @@
+ Name[fa]=اخراج
+ Name[fi]=Poista
+ Name[fr]=Éjecter
+-Name[fy]=útsmytknop
++Name[fy]=Utsmytknop
+ Name[ga]=Díchuir
+ Name[gl]=Expulsar
+ Name[he]=הוצא
+--- applnk/kde-settings-webbrowsing.directory	(revision 488815)
++++ applnk/kde-settings-webbrowsing.directory	(revision 494868)
+@@ -23,7 +23,7 @@
+ Name[fi]=WWW-selain
+ Name[fo]=Vevlesari
+ Name[fr]=Navigateur web
+-Name[fy]=Webbrowser
++Name[fy]=Webblêder
+ Name[ga]=Brabhsálaí Lín
+ Name[gl]=Navegador Web
+ Name[he]=דפדפן
+--- applnk/compat/bwarning.desktop	(revision 488815)
++++ applnk/compat/bwarning.desktop	(revision 494868)
+@@ -56,7 +56,7 @@
+ Name[ven]=Khomupwutha pfarwa
+ Name[wa]=Poirtåve
+ Name[xh]=Umphezulu osongiweyo
+-Name[zh_CN]=膝上计算机
++Name[zh_CN]=笔记本电脑
+ Name[zh_TW]=膝上型的電腦
+ Name[zu]=Ikhomputha ephathwayo eyisicaba
+ X-KDE-ModuleType=Library
+--- applnk/compat/email.desktop	(revision 488815)
++++ applnk/compat/email.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[de]=E-Mail
+ Name[eo]=Retpoŝto
+ Name[es]=Correo electrónico
+-Name[et]=E-mail
++Name[et]=E-post
+ Name[eu]=Posta elektronikoa
+ Name[fa]=پست الکترونیکی
+ Name[fi]=Sähköposti
+@@ -179,7 +179,7 @@
+ Keywords[hi]=ईमेल,डाक,ई-मेल,पता,ईमेल सर्वर्स,आईमेप,पॉप3,स्थानीय डाक डब्बा, डाक डब्बा, उपयोक्ता जानकारी,जवाबी पता,सर्वर जानकारी,उपयोक्ता नाम,पासवर्ड,होस्ट,मौज़ूदा प्रोफ़ाइल,प्रोफ़ाइल,संस्था,आवक होस्ट,जावक होस्ट,ईमेल क्लाएंट
+ Keywords[hsb]=EMail,Mail,E-Mail,Address,Email server,IMAP,POP3,Local mailbox,mailbox,User Information,Reply Address,Server information,User Name,Passwords,Host,Current Profile,Profile,Organization,Incoming Host,Outgoing Host,Email Client wužiwar, hesło, mailka, adresa, serwer, póštowy kašćik, póstowy kašćik
+ Keywords[hu]=email,e-mail,mail,üzenet,cím,levél,levelezési kiszolgáló,IMAP,POP3,helyi postaláda,postaláda,felhasználójellemzők,válaszcím,kiszolgálóinformáció,felhasználónév,jelszavak,gépnév,jelenlegi profil,szervezet,bemeneti kiszolgáló,kimeneti kiszolgáló,e-mail kliens
+-Keywords[is]=Tölvupóstur,póstur,netfang,heimilisfang,póstþjónn,notendaupplKeywords=Tölvupóstur,póstur,netfang,heimilisfang,póstþjónn,notendaupplýsingar,svarpóstfang,addressa,póstforrit
++Keywords[is]=Tölvupóstur,póstur,netfang,heimilisfang,póstþjónn,IMAP,POP3, pósthólf,notendaupplýsingar,svarpóstfang,póstfang,notandanafn, lykilorð,þjónn,póstforrit
+ Keywords[it]=email,mail,e-mail,posta,posta elettronica,indirizzo,server di posta elettronica,IMAP,POP3,casella di posta locale,casella di posta,informazioni utente,reply address,indirizzo di risposta,informazioni server,password,host,profilo attuale,profilo,organizzazione,posta in arrivo,server posta in arrivo,server posta in uscita,client di posta,Reply Address
+ Keywords[ja]=E メール,メール,E-メール,アドレス,E メールサーバ,IMAP,POP3 ,ローカルメールボックス,ユーザ情報,返信アドレス,サーバ情報,ユーザ名,パスワード,ホスト,現在のプロファイル,プロファイル,組織,着信ホスト,送信ホスト,E メールクライアント
+ Keywords[km]=អ៊ីម៉ែល,សំបុត្រ,អាសយដ្ឋាន,ម៉ាស៊ីន​បម្រើ​អ៊ីម៉ែល,IMAP,POP3,ប្រអប់​សំបុត្រ​មូលដ្ឋាន,ប្រអប់​សំបុត្រ,ព័ត៌មាន​អ្នក​ប្រើ,អាសយដ្ឋាន​ឆ្លើយតប,ព័ត៌មាន​ម៉ាស៊ីន​បម្រើ,ឈ្មោះ​អ្នក​ប្រើ,ពាក្យ​សម្ងាត់,កុំព្យូទ័រ,ទម្រង់​បច្ចុប្បន្ន,ទម្រង់,អង្គការ,កុំព្យូទ័រ​ផ្ញើ​ចូល,កុំព្យូទ័រ​ផ្ញើ​ចេញ,កម្មវិធី​អ៊ីម៉ែល
+--- applnk/compat/cwarning.desktop	(revision 488815)
++++ applnk/compat/cwarning.desktop	(revision 494868)
+@@ -56,7 +56,7 @@
+ Name[ven]=Khomupwutha pfarwa
+ Name[wa]=Poirtåve
+ Name[xh]=Umphezulu osongiweyo
+-Name[zh_CN]=膝上计算机
++Name[zh_CN]=笔记本电脑
+ Name[zh_TW]=膝上型的電腦
+ Name[zu]=Ikhomputha ephathwayo eyisicaba
+ X-KDE-ModuleType=Library
+--- applnk/compat/battery.desktop	(revision 488815)
++++ applnk/compat/battery.desktop	(revision 494868)
+@@ -56,7 +56,7 @@
+ Name[ven]=Khomupwutha pfarwa
+ Name[wa]=Poirtåve
+ Name[xh]=Umphezulu osongiweyo
+-Name[zh_CN]=膝上计算机
++Name[zh_CN]=笔记本电脑
+ Name[zh_TW]=膝上型的電腦
+ Name[zu]=Ikhomputha ephathwayo eyisicaba
+ X-KDE-ModuleType=Library
+--- applnk/compat/userinfo.desktop	(revision 488815)
++++ applnk/compat/userinfo.desktop	(revision 494868)
+@@ -96,7 +96,7 @@
+ Comment[eu]=Alda ezazu zure kontuaren informazioa
+ Comment[fi]=Käyttäjätiedot
+ Comment[fr]=Modifier les informations de votre compte
+-Comment[fy]=Feroarje dyn akkountynformaasje
++Comment[fy]=Feroarje jo akkountynformaasje
+ Comment[ga]=Athraigh sonruithe do chuntais
+ Comment[gl]=Cambiar a informazón da sua conta
+ Comment[he]=שנה את המידע של החשבון משתמש שלך
+--- applnk/compat/power.desktop	(revision 488815)
++++ applnk/compat/power.desktop	(revision 494868)
+@@ -56,7 +56,7 @@
+ Name[ven]=Khomupwutha pfarwa
+ Name[wa]=Poirtåve
+ Name[xh]=Umphezulu osongiweyo
+-Name[zh_CN]=膝上计算机
++Name[zh_CN]=笔记本电脑
+ Name[zh_TW]=膝上型的電腦
+ Name[zu]=Ikhomputha ephathwayo eyisicaba
+ X-KDE-ModuleType=Library
+--- applnk/compat/konqhtml.desktop	(revision 488815)
++++ applnk/compat/konqhtml.desktop	(revision 494868)
+@@ -21,7 +21,7 @@
+ Name[fa]=مرورگر کانکرر
+ Name[fi]=Konqueror
+ Name[fr]=Navigateur Konqueror
+-Name[fy]=Konqueror blêdzjer
++Name[fy]=Konqueror blêder
+ Name[ga]=Brabhsálaí Konqueror
+ Name[gl]=Navegador Konqueror
+ Name[he]=דפדפן Konqueror
+--- applnk/compat/kcmkxmlrpcd.desktop	(revision 488815)
++++ applnk/compat/kcmkxmlrpcd.desktop	(revision 494868)
+@@ -25,7 +25,7 @@
+ Name[he]=תהליך רקע XML RPC
+ Name[hi]=एक्सएमएल आरपीसी डीमॉन
+ Name[hu]=XML RPC szolgáltatás
+-Name[is]=XML RPC Þjónn
++Name[is]=XML RPC þjónn
+ Name[it]=Demone XML RPC
+ Name[ja]=XML RPC デーモン
+ Name[ko]=XML RPC 데몬
+--- konqueror/KonqMainWindowIface.cc	(revision 488815)
++++ konqueror/KonqMainWindowIface.cc	(revision 494868)
+@@ -28,6 +28,7 @@
+ #include <kdcopactionproxy.h>
+ #include <kdcoppropertyproxy.h>
+ #include <kdebug.h>
++#include <kstartupinfo.h>
+ #include <kwin.h>
+ 
+ KonqMainWindowIface::KonqMainWindowIface( KonqMainWindow * mainWindow )
+@@ -64,6 +65,12 @@
+   m_pMainWindow->openFilteredURL( url, true, tempFile );
+ }
+ 
++void KonqMainWindowIface::newTabASN( QString url, const QCString& startup_id, bool tempFile )
++{
++  KStartupInfo::setNewStartupId( m_pMainWindow, startup_id );
++  m_pMainWindow->openFilteredURL( url, true, tempFile );
++}
++
+ void KonqMainWindowIface::reload()
+ {
+   m_pMainWindow->slotReload();
+@@ -133,10 +140,6 @@
+         return false; // this window shows on different desktop
+     if( KonqMainWindow::isPreloaded() )
+         return false; // we want a tab in an already shown window
+-    if ( m_pMainWindow->isMinimized() )
+-        m_pMainWindow->showNormal();
+-
+-    m_pMainWindow->raise();
+     return true;
+ }
+ 
+--- konqueror/iconview/konq_iconview.desktop	(revision 488815)
++++ konqueror/iconview/konq_iconview.desktop	(revision 494868)
+@@ -23,7 +23,7 @@
+ Name[fa]=منظر شمایلی
+ Name[fi]=Kuvakenäkymä
+ Name[fr]=Icônes
+-Name[fy]=IkoanWerjefte
++Name[fy]=Byldkaike werjefte
+ Name[ga]=Amharc Deilbhíní
+ Name[gl]=Vista en Ícones
+ Name[he]=תצוגת סמלים
+--- konqueror/konqbrowser.desktop	(revision 488815)
++++ konqueror/konqbrowser.desktop	(revision 494868)
+@@ -39,7 +39,7 @@
+ GenericName[fi]=WWW-selain
+ GenericName[fo]=Alnótsfar
+ GenericName[fr]=Navigateur web
+-GenericName[fy]=Webblêdzjer
++GenericName[fy]=Webblêder
+ GenericName[ga]=Brabhsálaí Lín
+ GenericName[gl]=Navegador Web
+ GenericName[he]=דפדפן אינטרנט
+--- konqueror/profile_simplebrowser.desktop	(revision 488815)
++++ konqueror/profile_simplebrowser.desktop	(revision 494868)
+@@ -16,7 +16,7 @@
+ Name[eu]=Web arakatzaile erreza
+ Name[fi]=Yksinkertainen selain
+ Name[fr]=Navigateur simple
+-Name[fy]=Ienfâldige blêdzjer
++Name[fy]=Ienfâldige blêder
+ Name[ga]=Brabhsálaí Simplí
+ Name[gl]=Navegador Sinxelo
+ Name[he]=דפדפן פשוט
+--- konqueror/KonquerorIface.h	(revision 488815)
++++ konqueror/KonquerorIface.h	(revision 494868)
+@@ -46,7 +46,6 @@
+   /**
+    * Like @ref openBrowserWindow , with setting the application startup notification ( ASN )
+    * property on the window.
+-   * This DCOP call is internal to kfmclient, don't use.
+    */
+   DCOPRef openBrowserWindowASN( const QString &url, const QCString &startup_id );
+ 
+@@ -57,7 +56,6 @@
+   /**
+    * Like @ref createNewWindow , with setting the application startup notification ( ASN )
+    * property on the window.
+-   * This DCOP call is internal to kfmclient.
+    */
+   DCOPRef createNewWindowASN( const QString &url, const QCString &startup_id, bool tempFile );
+ 
+@@ -68,7 +66,6 @@
+   /**
+    * Like @ref createNewWindowWithSelection, with setting the application startup notification ( ASN )
+    * property on the window.
+-   * This DCOP call is internal to kfmclient.
+    */
+   DCOPRef createNewWindowWithSelectionASN( const QString &url, QStringList filesToSelect, const QCString &startup_id );
+ 
+@@ -80,7 +77,6 @@
+   /**
+    * Like @ref createNewWindow , with setting the application startup notification ( ASN )
+    * property on the window.
+-   * This DCOP call is internal to kfmclient.
+    */
+   DCOPRef createNewWindowASN( const QString &url, const QString & mimetype,
+       const QCString &startup_id, bool tempFile );
+@@ -93,7 +89,6 @@
+   /**
+    * Like @ref createBrowserWindowFromProfile , with setting the application startup
+    * notification ( ASN ) property on the window.
+-   * This DCOP call is internal to kfmclient.
+    */
+   DCOPRef createBrowserWindowFromProfileASN( const QString &path, const QCString &startup_id );
+ 
+@@ -107,7 +102,6 @@
+   /**
+    * Like @ref createBrowserWindowFromProfile , with setting the application startup
+    * notification ( ASN ) property on the window.
+-   * This DCOP call is internal to kfmclient.
+    */
+   DCOPRef createBrowserWindowFromProfileASN( const QString &path, const QString &filename,
+       const QCString &startup_id );
+@@ -124,7 +118,6 @@
+   /**
+    * Like @ref createBrowserWindowFromProfileAndURL , with setting the application startup
+    * notification ( ASN ) property on the window.
+-   * This DCOP call is internal to kfmclient.
+    */
+   DCOPRef createBrowserWindowFromProfileAndURLASN( const QString &path, const QString &filename, const QString &url,
+       const QCString &startup_id );
+@@ -141,7 +134,6 @@
+   /**
+    * Like @ref createBrowserWindowFromProfileAndURL , with setting the application startup
+    * notification ( ASN ) property on the window.
+-   * This DCOP call is internal to kfmclient.
+    */
+   DCOPRef createBrowserWindowFromProfileAndURLASN( const QString &path, const QString &filename, const QString &url, const QString &mimetype,
+       const QCString& startup_id );
+--- konqueror/profile_tabbedbrowsing.desktop	(revision 488815)
++++ konqueror/profile_tabbedbrowsing.desktop	(revision 494868)
+@@ -18,7 +18,7 @@
+ Name[eu]=Fitxa bitarteko arakaketa
+ Name[fi]=Välilehdillä varustettu selain
+ Name[fr]=Navigation par onglets
+-Name[fy]=Blêdzjer mei Ljeppers
++Name[fy]=Blêder mei ljeppers
+ Name[ga]=Brabhsáil le Cluaisíní
+ Name[gl]=Navegazón con Pestanas
+ Name[he]=גלישה בכרטיסיות
+--- konqueror/quickprint/text-tex-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-tex-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-xml-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-xml-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-perl-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-perl-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-html-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-html-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-diff-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-diff-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-c++-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-c++-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-makefile-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-makefile-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-c++h-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-c++h-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-log-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-log-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-java-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-java-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-python-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-python-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-c-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-c-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-tcl-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-tcl-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-pas-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-pas-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-ada-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-ada-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-css-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-css-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-ch-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-ch-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/quickprint/text-xslt-print.desktop	(revision 488815)
++++ konqueror/quickprint/text-xslt-print.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+-Name[fy]=Ofdrukken...
++Name[fy]=Printsje...
+ Name[ga]=Priontáil...
+ Name[gl]=Imprimir...
+ Name[he]=הדפס...
+--- konqueror/kttsplugin/khtmlkttsd.cpp	(revision 488815)
++++ konqueror/kttsplugin/khtmlkttsd.cpp	(revision 494868)
+@@ -40,7 +40,7 @@
+     KTrader::OfferList offers = KTrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
+     if (offers.count() > 0)
+     {
+-        (void) new KAction( "&Speak Text",
++        (void) new KAction( i18n("&Speak Text"),
+             "kttsd", 0,
+             this, SLOT(slotReadOut()),
+             actionCollection(), "tools_kttsd" );
+--- konqueror/sidebar/trees/init/bookmarks.desktop	(revision 488815)
++++ konqueror/sidebar/trees/init/bookmarks.desktop	(revision 494868)
+@@ -96,7 +96,7 @@
+ Comment[fa]=این سیاهه‌ای از چوب‌الف‌های شماست،برای دسترسی سریعتر
+ Comment[fi]=Tämä on lista kirjanmerkeistäsi
+ Comment[fr]=Voici la liste de vos signets, afin que vous y accédiez plus rapidement
+-Comment[fy]=Dit is de list mei dyn blêdwizers, foar fluggere tagong
++Comment[fy]=Dit is de list mei jo blêdwizers, foar fluggere tagong
+ Comment[ga]=Seo liosta do chuid leabharmharcanna, le haghaidh rochtain níos tapúla
+ Comment[gl]=Ésta é a lista dos seus marcadores, para un aceso máis rápido
+ Comment[he]=זוהי רשימת הסימניות שלך, לגישה מהירה
+--- konqueror/sidebar/trees/init/home.desktop	(revision 488815)
++++ konqueror/sidebar/trees/init/home.desktop	(revision 494868)
+@@ -89,7 +89,7 @@
+ Comment[fa]=این پوشه شامل پرونده‌ی‌های شخصی شماست
+ Comment[fi]=Tämä kansio sisältää henkilökohtaiset tiedostot
+ Comment[fr]=Ce dossier contient tous vos fichiers personnels
+-Comment[fy]=Dizze map befet al dyn persoanlike triemen
++Comment[fy]=Dizze map befettet al jo persoanlike triemen
+ Comment[ga]=Tá do chomhaid phearsanta san fhillteán seo
+ Comment[gl]=Este cartafol contén os seus arquivos persoais
+ Comment[he]=תיקייה זו מכילה את הקבצים האישיים שלך
+--- konqueror/sidebar/trees/init/services/audiocd.desktop	(revision 488815)
++++ konqueror/sidebar/trees/init/services/audiocd.desktop	(revision 494868)
+@@ -24,7 +24,7 @@
+ Name[fa]=مرورگر CD شنیداری
+ Name[fi]=Audio CD:n selain
+ Name[fr]=Navigateur de CD audio
+-Name[fy]=Audio kompaktskiif Blêzjer
++Name[fy]=Audio kompaktskiif blêder
+ Name[ga]=Brabhsálaí Dhlúthdhiosca Fuaime
+ Name[gl]=Navegador de CD de Audio
+ Name[he]=דפדפן תקליטורי שמע
+--- konqueror/sidebar/trees/init/services/printsystem.desktop	(revision 488815)
++++ konqueror/sidebar/trees/init/services/printsystem.desktop	(revision 494868)
+@@ -23,7 +23,7 @@
+ Name[fa]=چاپ مرورگر سیستم
+ Name[fi]=Tulostusjärjestelmä
+ Name[fr]=Navigateur dans le système d'impression
+-Name[fy]=Afdruksysteembrowser
++Name[fy]=Printsysteemblêder
+ Name[ga]=Brabhsálaí an Chóras Priontála
+ Name[gl]=Navegador do Sistema de Impresión
+ Name[he]=דפדפן מערכות הדפסה
+--- konqueror/sidebar/trees/init/bookmarks_module.desktop	(revision 488815)
++++ konqueror/sidebar/trees/init/bookmarks_module.desktop	(revision 494868)
+@@ -96,7 +96,7 @@
+ Comment[fa]=این سیاهه‌ای از چوب‌الف‌های شماست،برای دسترسی سریعتر
+ Comment[fi]=Tämä on lista kirjanmerkeistäsi
+ Comment[fr]=Voici la liste de vos signets, afin que vous y accédiez plus rapidement
+-Comment[fy]=Dit is de list mei dyn blêdwizers, foar fluggere tagong
++Comment[fy]=Dit is de list mei jo blêdwizers, foar fluggere tagong
+ Comment[ga]=Seo liosta do chuid leabharmharcanna, le haghaidh rochtain níos tapúla
+ Comment[gl]=Ésta é a lista dos seus marcadores, para un aceso máis rápido
+ Comment[he]=זוהי רשימת הסימניות שלך, לגישה מהירה
+--- konqueror/sidebar/trees/init/history.desktop	(revision 488815)
++++ konqueror/sidebar/trees/init/history.desktop	(revision 494868)
+@@ -96,7 +96,7 @@
+ Comment[fa]=سیاهه‌ای از تاریخچه‌ی URLهایی که اخیرا دیده‌اید.می‌توانید آنهارا به هر صورت دلخواه مرتب کنید.
+ Comment[fi]=Tämä on historia selatuista verkko-osoitteista. Ne voidaan järjestää monella tavalla.
+ Comment[fr]=Voici la liste des URL que vous avez récemment visitées. Vous pouvez les trier de multiples façons.
+-Comment[fy]=Dit is de histoarje fan de URL-adressen wêrst koartlyn west bist. Do kinst se op meardere manieren sortearje.
++Comment[fy]=Dit is de histoarje fan de URL-adressen wêr jo koartlyn west ha. Jo kinne se op ferskate manieren sortearje.
+ Comment[gl]=Éste é o historial de URLs que visitou recentemente. Pode ordená-las de vários xeitos.
+ Comment[he]=זוהי היסטוריית הכתובות בהן ביקרת לאחרונה. באפשרותך לסדר אותה במגוון דרכים.
+ Comment[hi]=आप जो हालिया भ्रमण किए हैं, उन यूआरएल का यह इतिहास है. आप इन्हें कई तरीकों से क्रमबद्ध कर सकते हैं.
+--- konqueror/sidebar/trees/init/remote/web/look_web.desktop	(revision 488815)
++++ konqueror/sidebar/trees/init/remote/web/look_web.desktop	(revision 494868)
+@@ -14,7 +14,7 @@
+ Name[et]=KDE silmarõõm
+ Name[fi]=KDE:n silmän iloa
+ Name[fr]=Agrément visuel KDE
+-Name[fy]=Eachstrieljend KDE
++Name[fy]=Eachstrieljende KDE
+ Name[gl]=Embelecimento de KDE
+ Name[he]=צעצועים חזותיים של KDE
+ Name[hu]=KDE grafikai kiegészítők
+--- konqueror/sidebar/trees/init/root.desktop	(revision 488815)
++++ konqueror/sidebar/trees/init/root.desktop	(revision 494868)
+@@ -24,7 +24,7 @@
+ Name[eu]=Erro karpeta
+ Name[fi]=Juurikansio
+ Name[fr]=Dossier racine
+-Name[fy]=Rootmap
++Name[fy]=Haadmap
+ Name[ga]=Fréamhfhillteán
+ Name[gl]=Cartafol Raíz
+ Name[he]=תיקיית שורש
+@@ -89,7 +89,7 @@
+ Comment[fa]=اینجا ریشه‌ی سیستم پرونده است
+ Comment[fi]=Tämä on tiedostojärjestelmän juuri
+ Comment[fr]=Ce dossier est à la racine de votre arborescence
+-Comment[fy]=Dit is de Root fan it triemsysteem
++Comment[fy]=Dit is de haad fan it triemsysteem
+ Comment[ga]=Seo fréamh an comhadchórais
+ Comment[gl]=Ésta é a raiz do sistema de arquivos
+ Comment[he]=זהו השורש של מערכת הקבצים שלך
+--- konqueror/sidebar/trees/init/system.desktop	(revision 488815)
++++ konqueror/sidebar/trees/init/system.desktop	(revision 494868)
+@@ -73,49 +73,24 @@
+ Name[zh_CN]=系统
+ Name[zh_TW]=系統
+ Name[zu]=Isistimu
+-Comment=This folder allows to access common places in your computer
+-Comment[af]=Hierdie gids laat toegang na algemene plekke op die rekenaar toe
+-Comment[bg]=Директория за достъп до често използваните места в компютъра
+-Comment[bn]=এই ফোল্ডারটি আপনার কম্পিউটারে সাধারণত ব্যবহৃত অবস্থানগুলিতে চটপট চলে যেতে সাহায্য করে
++Comment=This folder allows you to access common places on your computer
+ Comment[cs]=Tato složka zpřístupňuje často používaná umístění na vašem počítači
+-Comment[da]=Denne mappe giver adgang til sædvanlige steder på din computer
+-Comment[de]=Dieser Ordner ermöglicht den Zugriff auf gebräuchliche Systembereiche des Computers
++Comment[da]=Denne mappe giver adgang til almindelige steder på din computer
+ Comment[el]=Αυτός ο φάκελος σας επιτρέπει την πρόσβαση σε τυπικές τοποθεσίες του συστήματός σας
+-Comment[en_GB]=This folder allows you to access common places in your computer
+ Comment[es]=Esta carpeta permite acceder a lugares usuales en su ordenador
+ Comment[et]=See kataloog võimaldab juurdepääsu tavalistele kohtadele su arvutis
+-Comment[eu]=Karpeta honek zure ordenagailuaren leku arruntetarako sarbidea ematen dizu
+-Comment[fi]=Tämä kansio sallii pääsyn tietokoneesi yleisiin kohteisiin
+ Comment[fr]=Ce dossier vous permet d'accéder aux endroits de votre ordinateur régulièrement utilisés
+ Comment[fy]=Dizze map jout tagong ta algemiene plakken yn jo kompjûter
+-Comment[gl]=Este cartafol permite-lle aceder a lugares habituais do seu ordenador
+-Comment[he]=תיקייה זו מכילה את הקבצים האישיים שלך
+-Comment[hu]=Néhány fontosabb rendszerkönyvtár elérése
++Comment[hu]=Néhány fontosabb rendszerkönyvtár elérését teszi lehetővé
+ Comment[is]=Þessi mappa veitir aðgang að almennum stöðum á tölvunni þinni
+-Comment[it]=Questa cartella permette di accedere agli oggetti comuni del tuo computer
+-Comment[ja]=このフォルダにより、コンピュータの共通の場所にアクセスできるようになります。
+-Comment[km]=ថត​នេះ​អនុញ្ញាត​ឲ្យ​ចូលដំណើរការ​កន្លែង​ទូទៅ​ក្នុង​កុំព្យូទ័រ​របស់​អ្នក
+-Comment[lt]=Šio aplanko pagalba pasieksite dažniausiai lankomas kompiuterio vietas
+-Comment[mk]=Оваа папка ви овозможува пристап до вообичаените места на вашиот компјутер
+-Comment[nb]=Denne mappa gir deg tilgang til vanlige steder på din datamaskin
+-Comment[nds]=Disse Orner bargt en Reeg faken bruukte Systeemoorden
+-Comment[nl]=Deze map geeft toegang tot algemene plekken in uw computer
+-Comment[nn]=Denne mappa gir deg tilgang til nokre vanlege stader på datamaskina
+-Comment[pa]=ਇਹ ਫੋਲਡਰ ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ 'ਚ ਆਮ ਥਾਵਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ
+-Comment[pl]=Ten folder umożliwia dostęp do najczęściej używanych miejsc w Twoim komputerze
++Comment[lt]=Šio aplanko padedami pasieksite dažniausiai lankomas kompiuterio vietas
++Comment[nds]=Mit dissen Orner kannst Du op en Reeg faken bruukte Öörd togriepen
++Comment[nl]=Deze map geeft toegang tot algemene plekken van uw desktop
+ Comment[pt]=Esta pasta permite aceder a alguns locais comuns no seu computador
+-Comment[pt_BR]=Esta pasta permite acesso a lugares comuns em seu computador
+-Comment[ru]=Папка для доступа к часто используемым ресурсам системы
+-Comment[se]=Dán máhpa bokte beasat álkit dihtorat dehálaš báikkiide
+-Comment[sl]=Ta mapa omogoča dostop do pomembnih lokacij na vašem računalniku
+-Comment[sr]=Ова фасцикла омогућава приступ уобичајеним местима на вашем рачунару
+-Comment[sr at Latn]=Ova fascikla omogućava pristup uobičajenim mestima na vašem računaru
++Comment[pt_BR]=Esta pasta permite aceder a alguns locais comuns no seu computador
+ Comment[sv]=Den här katalogen gör det möjligt att komma åt vanliga platser på din dator
+-Comment[th]=โฟลเดอร์นี้อนุญาตให้คุณเข้าถึงสถานที่ทั่วๆ ไปในเครื่องคอมพิวเตอร์ของคุณ
+-Comment[tr]=Bu dizin bilgisayardaki belirli yerlere eriÅŸim saÄŸlar
+ Comment[uk]=Ця тека надає доступ до спільних місць у вашому комп'ютері
+ Comment[zh_CN]=此文件夹允许您访问计算机中的公共位置
+-Comment[zh_TW]=這個資料夾允許存取您電腦上的一般空間
+ Open=true
+ X-KDE-TreeModule=Directory
+ X-KDE-KonqSidebarModule=konqsidebar_tree
+--- konqueror/sidebar/trees/init/history_module.desktop	(revision 488815)
++++ konqueror/sidebar/trees/init/history_module.desktop	(revision 494868)
+@@ -96,7 +96,7 @@
+ Comment[fa]=سیاهه‌ای از تاریخچه‌ی URLهایی که اخیرا دیده‌اید.می‌توانید آنهارا به هر صورت دلخواه مرتب کنید.
+ Comment[fi]=Tämä on historia selatuista verkko-osoitteista. Ne voidaan järjestää monella tavalla.
+ Comment[fr]=Voici la liste des URL que vous avez récemment visitées. Vous pouvez les trier de multiples façons.
+-Comment[fy]=Dit is de histoarje fan de URL-adressen wêrst koartlyn west bist. Do kinst se op meardere manieren sortearje.
++Comment[fy]=Dit is de histoarje fan de URL-adressen wêr jo koartlyn west ha. Jo kinne se op ferskate manieren sortearje.
+ Comment[gl]=Éste é o historial de URLs que visitou recentemente. Pode ordená-las de vários xeitos.
+ Comment[he]=זוהי היסטוריית הכתובות בהן ביקרת לאחרונה. באפשרותך לסדר אותה במגוון דרכים.
+ Comment[hi]=आप जो हालिया भ्रमण किए हैं, उन यूआरएल का यह इतिहास है. आप इन्हें कई तरीकों से क्रमबद्ध कर सकते हैं.
+--- konqueror/sidebar/trees/history_module/kcmhistory.desktop	(revision 488815)
++++ konqueror/sidebar/trees/history_module/kcmhistory.desktop	(revision 494868)
+@@ -97,7 +97,7 @@
+ Comment[fa]=تنظیم میله‌ی تاریخچه
+ Comment[fi]=Historiasivupalkin asetukset
+ Comment[fr]=Configuration de l'historique de la barre latérale
+-Comment[fy]=Hjir kinst de hiostoarje ynstelle
++Comment[fy]=Hjir kinne jo de histoarje ynstelle
+ Comment[ga]=Cumraigh an barra taoibh staire
+ Comment[gl]=Configurar o historial da barra lateral
+ Comment[he]=שינוי הגדרות הסרגל הצדדי של ההיסטוריה
+--- konqueror/client/kfmclient.cc	(revision 488815)
++++ konqueror/client/kfmclient.cc	(revision 494868)
+@@ -275,6 +275,22 @@
+     return ret;
+ }
+ 
++void clientApp::sendASNChange()
++{
++    KStartupInfoId id;
++    id.initId( startup_id_str );
++    KStartupInfoData data;
++    data.addPid( 0 );   // say there's another process for this ASN with unknown PID
++    data.setHostname(); // ( no need to bother to get this konqy's PID )
++    Display* dpy = qt_xdisplay();
++    if( dpy == NULL ) // we may be running without QApplication here
++        dpy = XOpenDisplay( NULL );
++    if( dpy != NULL )
++        KStartupInfo::sendChangeX( dpy, id, data );
++    if( dpy != NULL && dpy != qt_xdisplay())
++        XCloseDisplay( dpy );
++}
++
+ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, const QString & mimetype)
+ {
+     kdDebug( 1202 ) << "clientApp::createNewWindow " << url.url() << " mimetype=" << mimetype << endl;
+@@ -321,9 +337,9 @@
+             "windowCanBeUsedForTab()", data, foundApp, foundObj, false, 3000 ) )
+         {
+             DCOPRef ref( foundApp, foundObj );
+-            DCOPReply reply = ref.call( "newTab", url.url(), tempFile );
++            DCOPReply reply = ref.call( "newTabASN", url.url(), startup_id_str, tempFile );
+             if ( reply.isValid() ) {
+-                KStartupInfo::appStarted();
++                sendASNChange();
+                 return true;
+             }
+       }
+@@ -335,18 +351,7 @@
+         kdDebug( 1202 ) << "clientApp::createNewWindow using existing konqueror" << endl;
+         KonquerorIface_stub konqy( appId, "KonquerorIface" );
+         konqy.createNewWindowASN( url.url(), mimetype, startup_id_str, tempFile );
+-        KStartupInfoId id;
+-        id.initId( startup_id_str );
+-        KStartupInfoData data;
+-        data.addPid( 0 );   // say there's another process for this ASN with unknown PID
+-        data.setHostname(); // ( no need to bother to get this konqy's PID )
+-        Display* dpy = qt_xdisplay();
+-        if( dpy == NULL ) // we may be running without QApplication here
+-            dpy = XOpenDisplay( NULL );
+-        if( dpy != NULL )
+-            KStartupInfo::sendChangeX( dpy, id, data );
+-        if( dpy != NULL && dpy != qt_xdisplay())
+-            XCloseDisplay( dpy );
++        sendASNChange();
+     }
+     else
+     {
+@@ -406,18 +411,7 @@
+   else
+       konqy.createBrowserWindowFromProfileAndURLASN( profile, profileName, url, mimetype, startup_id_str );
+   sleep(2); // Martin Schenk <martin at schenk.com> says this is necessary to let the server read from the socket
+-  KStartupInfoId id;
+-  id.initId( startup_id_str );
+-  KStartupInfoData sidata;
+-  sidata.addPid( 0 );   // say there's another process for this ASN with unknown PID
+-  sidata.setHostname(); // ( no need to bother to get this konqy's PID )
+-  Display* dpy = qt_xdisplay();
+-  if( dpy == NULL ) // we may be running without QApplication here
+-      dpy = XOpenDisplay( NULL );
+-  if( dpy != NULL )
+-      KStartupInfo::sendChangeX( dpy, id, sidata );
+-  if( dpy != NULL && dpy != qt_xdisplay())
+-      XCloseDisplay( dpy );
++  sendASNChange();
+   return true;
+ }
+ 
+--- konqueror/client/kfmclient.h	(revision 488815)
++++ konqueror/client/kfmclient.h	(revision 494868)
+@@ -41,6 +41,7 @@
+   void delayedQuit();
+ 
+ private:
++  static void sendASNChange();
+   static bool m_ok;
+   static QCString startup_id_str;
+ 
+--- konqueror/KonqMainWindowIface.h	(revision 488815)
++++ konqueror/KonqMainWindowIface.h	(revision 494868)
+@@ -48,6 +48,8 @@
+   void openURL( QString url, bool tempFile );
+   void newTab( QString url, bool tempFile );
+ 
++  void newTabASN( QString url, const QCString& startup_id, bool tempFile );
++
+   /**
+    * Reloads the current view.
+    */
+--- konqueror/konq_mainwindow.cc	(revision 488815)
++++ konqueror/konq_mainwindow.cc	(revision 494868)
+@@ -830,7 +830,7 @@
+   {
+       if ( !childView->isLockedViewMode() )
+       {
+-          bool forceAutoEmbed = req.forceAutoEmbed || req.newTab;
++          bool forceAutoEmbed = req.forceAutoEmbed || req.newTab || req.userRequestedReload;
+           if ( !req.typedURL.isEmpty() ) // the user _typed_ the URL, he wants it in Konq.
+               forceAutoEmbed = true;
+           if ( url.protocol() == "about" )
+--- konqueror/konqueror.desktop	(revision 488815)
++++ konqueror/konqueror.desktop	(revision 494868)
+@@ -36,7 +36,7 @@
+ Comment[fa]=مدیر پرونده و مرورگر شبکه‌ی KDE
+ Comment[fi]=KDE:n tiedostonhallinta ja WWW-selain
+ Comment[fr]=Gestionnaire de fichiers et navigateur web de KDE
+-Comment[fy]=KDE's Triembehearder en webblêdzjer
++Comment[fy]=KDE's Triembehearder en webblêder
+ Comment[ga]=Bainisteoir Comhad & Brabhsálaí KDE
+ Comment[gl]=Xestor de Arquivos e Navegador Web de KDE
+ Comment[he]=מנהל הקבצים ודפדפן האינטרנט של KDE
+--- ksplashml/kcmksplash/ksplashthememgr.desktop	(revision 488815)
++++ ksplashml/kcmksplash/ksplashthememgr.desktop	(revision 494868)
+@@ -156,7 +156,7 @@
+ Keywords[eu]=splash pantaila,splash gaia,abioa
+ Keywords[fi]=aloitusruutu,aloitusruututeema,käynnistys
+ Keywords[fr]=écran de démarrage,thème de démarrage,démarrage,splash screen
+-Keywords[fy]=opstartscherm,begjinskerm,splash screen,
++Keywords[fy]=opstartscherm,begjinskerm,splash screen
+ Keywords[ga]=splancscáileán,splancthéama,tosú,tosach
+ Keywords[gl]=pantalla de benvida,tema de benvida,comezo
+ Keywords[he]=מצג פתיחה,ערכת נושא למצג פתיחה,הפעלה,splash screen,splash theme,startup
+--- ksplashml/themeengine/default/themelegacy.cpp	(revision 488815)
++++ ksplashml/themeengine/default/themelegacy.cpp	(revision 494868)
+@@ -303,7 +303,8 @@
+       if ((p = locate("appdata", QString("pics/")+mTheme->theme()+"/"+f)).isEmpty())
+         if ((p = locate("appdata",f)).isEmpty())
+           if ((p = locate("appdata",QString("pics/")+f)).isEmpty())
+-            if ((p = locate("data",QString("pics/")+f)).isEmpty())
++            if ((p = locate("data",QString("pics/")+f)).isEmpty()) {
+               ; // No more places to search
++            }
+   return p;
+ }
+--- kxkb/kxkb.cpp	(revision 488815)
++++ kxkb/kxkb.cpp	(revision 494868)
+@@ -1,6 +1,6 @@
+ /*
+     Copyright (C) 2001, S.R.Haque <srhaque at iee.org>. Derived from an
+-    original by Matthias Hölzer-Klüpfel released under the QPL.
++    original by Matthias H�zer-Klpfel released under the QPL.
+     This file is part of the KDE project
+ 
+     This library is free software; you can redistribute it and/or
+@@ -71,10 +71,10 @@
+ }
+ 
+ 
+-void TrayWindow::setCurrentLayout(const QString& layout)
++void TrayWindow::setCurrentLayout(const QString& layout, const QString &variant)
+ {
+     QToolTip::remove(this);
+-    QToolTip::add(this, mDescriptionMap[layout]);
++    QToolTip::add(this, mDescriptionMap[layout] + (variant.isNull()? "" : " (" + variant + ")" ) );
+ 
+     KIconEffect iconeffect;
+ 
+@@ -105,9 +105,9 @@
+     QStringList::ConstIterator it;
+     for (it=layouts.begin(); it != layouts.end(); ++it)
+     {
+-        const QPixmap pix = iconeffect.apply(LayoutIcon::findPixmap(*it, m_showFlag), KIcon::Small, KIcon::DefaultState);
+-        contextMenu()->insertItem(pix, i18n((rules.layouts()[*it])), cnt++);
+-        mDescriptionMap.insert(*it, i18n((rules.layouts()[*it])));
++        const QPixmap pix = iconeffect.apply(LayoutIcon::findPixmap(rules.getLayout(*it), m_showFlag), KIcon::Small, KIcon::DefaultState);
++        contextMenu()->insertItem(pix, i18n((rules.layouts()[rules.getLayout(*it)])) + " (" + rules.getVariant(*it) + ")", cnt++);
++        mDescriptionMap.insert(rules.getLayout(*it), i18n((rules.layouts()[rules.getLayout(*it)])));
+     }    
+ 
+     contextMenu()->insertItem(SmallIcon("configure"), i18n("Configure..."), cnt++);
+@@ -228,19 +228,13 @@
+     m_layout = config->readEntry("Layout", "");
+     m_defaultLayout = m_layout;
+ 
+-
+     m_list = config->readListEntry("Additional");
+-    if (!m_list.contains(m_layout))
+-    {
+-        m_list.prepend(m_layout);
+-    }
++    m_list.prepend(m_layout);
+ 
+     kdDebug() << "found " << m_list.count() << " layouts" << endl;
+ 
+ // reading variants
+     m_variants.clear();
+-    QStringList vars = config->readListEntry("Variants");
+-    m_rules->parseVariants(vars, m_variants);
+ 
+     m_includes.clear();
+     if( m_rules->isXFree_v43() ) {
+@@ -252,9 +246,9 @@
+ 	precompileLayouts();
+     }
+     else {
+-	int group = m_rules->getGroup(m_layout, m_includes[m_layout]);
+-        if( !m_extension->setLayout(m_model, m_layout, m_variants[m_layout], group, m_includes[m_layout]) ) {
+-	    kdDebug() << "Error switching to single layout " << m_layout << endl;
++	int group = m_rules->getGroup(m_rules->getLayout(m_layout), m_includes[m_rules->getLayout(m_layout)]);
++        if( !m_extension->setLayout(m_model, m_rules->getLayout(m_layout), m_rules->getVariant(m_layout, QString::null), group, m_includes[m_rules->getLayout(m_layout)]) ) {
++	    kdDebug() << "Error switching to single layout " << m_rules->getLayout(m_layout) << endl;
+ // kapp->quit();
+ 	}
+ 	bool showSingle = config->readBoolEntry("ShowSingle", false);
+@@ -278,7 +272,7 @@
+     bool showFlag = config->readBoolEntry("ShowFlag", true);
+     m_tray->setShowFlag(showFlag);
+     m_tray->setLayouts(m_list, *m_rules);
+-    m_tray->setCurrentLayout(m_layout);
++    m_tray->setCurrentLayout(m_rules->getLayout(m_layout), m_rules->getVariant(m_layout, QString::null));
+     m_tray->show();
+ 
+     delete config;
+@@ -301,7 +295,7 @@
+ bool KXKBApp::setLayout(const QString& layout)
+ {
+     bool res = false;
+-    const char* baseGr = m_includes[layout]; 
++    const char* baseGr = m_includes[m_rules->getLayout(layout)];
+     m_group = m_rules->getGroup(layout, baseGr);
+ 
+     if ( m_compiledLayoutFileNames.contains(layout) && !m_forceSetXKBMap )
+@@ -314,7 +308,7 @@
+ 
+     if ( !res ) // try not compiled layout, store compiled if success
+     {
+-        res = m_extension->setLayout(m_model, layout, m_variants[layout], m_group, baseGr);
++        res = m_extension->setLayout(m_model, m_rules->getLayout(layout), m_rules->getVariant(layout, QString::null), m_group, baseGr);
+ //	kdDebug() << "setting non-compiled for " << layout << ": " << res << endl;
+         if( res )
+             m_extension->getCompiledLayout(m_compiledLayoutFileNames[layout]);
+@@ -325,7 +319,7 @@
+     
+     if (m_tray) {
+ 	if( res ) {
+-	    m_tray->setCurrentLayout(layout);
++	    m_tray->setCurrentLayout(m_rules->getLayout(layout), m_rules->getVariant(layout));
+ 	}
+ 	else  
+ 	    m_tray->setError(layout);
+@@ -350,9 +344,9 @@
+ //	const char* baseGr = m_includes[layout]; 
+ //	int group = m_rules->getGroup(layout, baseGr);
+ //    	if( m_extension->setLayout(m_model, layout, m_variants[layout], group, baseGr) ) {
+-    	    QString compiledLayoutFileName = tempDir + layout + ".xkm";
++    	    QString compiledLayoutFileName = tempDir + m_rules->getLayout(layout) + ".xkm";
+ //    	    if( m_extension->getCompiledLayout(compiledLayoutFileName) )
+-    		m_compiledLayoutFileNames[layout] = compiledLayoutFileName;
++    		m_compiledLayoutFileNames[m_rules->getLayout(layout)] = compiledLayoutFileName;
+ //	}
+ //	else {
+ //    	    kdDebug() << "Error precompiling layout " << layout << endl;
+@@ -396,7 +390,7 @@
+ 		}
+ 	    }
+ 	}
+-	m_lastLayout->enqueue(new QString(m_layout));
++	m_lastLayout->enqueue(new QString(m_rules->getLayout(m_layout)));
+ 	
+ 	// shrink queue if m_stickySwitchingDepth has been decremented
+ 	
+@@ -427,7 +421,7 @@
+     
+     if( prevWinId ) {	// saving layout/group from previous window
+ 			// this will not work for the window activated before kxkb start :(
+-	    LayoutInfo layoutInfo(m_layout, group, m_lastLayout);
++	    LayoutInfo layoutInfo(m_rules->getLayout(m_layout), group, m_lastLayout);
+ 	    m_layoutOwnerMap.setLayout(prevWinId, layoutInfo);
+     }
+     
+@@ -445,7 +439,7 @@
+ 
+     m_lastLayout = layoutInfo.getLastLayout();
+ 	
+-    if( layoutInfo.layout != m_layout ) {
++    if( layoutInfo.layout != m_rules->getLayout(m_layout) ) {
+ 	m_layout = layoutInfo.layout;
+         layoutApply();	// we have to add group parameter to settingApply() ??
+ 	m_extension->setGroup(layoutInfo.group);
+@@ -464,7 +458,7 @@
+ 	{
+ 	    if ((int)m_lastLayout->count() >= m_stickySwitchingDepth)
+ 		delete m_lastLayout->dequeue();
+-	    m_lastLayout->enqueue(new QString(m_layout));
++	    m_lastLayout->enqueue(new QString(m_rules->getLayout(m_layout)));
+ 	}
+ 
+         m_layout = m_list[id];
+--- kxkb/rules.h	(revision 488815)
++++ kxkb/rules.h	(revision 494868)
+@@ -16,6 +16,10 @@
+   const QDict<char> &layouts() const { return m_layouts; };
+   const QDict<char> &options() const { return m_options; };
+ 
++  const QString getLayout(const QString &layvar) const;
++  const QString getVariant(const QString &layvar) const;
++  const QString getVariant(const QString &layvar, const QString &layout);
++
+   void parseVariants(const QStringList& vars, QDict<char>& variants, bool chkVars=true);
+ //  static QStringList rules(QString path = QString::null);
+ 
+--- kxkb/kxkb.h	(revision 488815)
++++ kxkb/kxkb.h	(revision 494868)
+@@ -1,6 +1,6 @@
+ /*
+     Copyright (C) 2001, S.R.Haque <srhaque at iee.org>. Derived from an
+-    original by Matthias Hölzer-Klüpfel released under the QPL.
++    original by Matthias H�zer-Klpfel released under the QPL.
+     This file is part of the KDE project
+ 
+     This library is free software; you can redistribute it and/or
+@@ -51,7 +51,7 @@
+     TrayWindow(QWidget *parent=0, const char *name=0);
+ 
+     void setLayouts(const QStringList& layouts, const KeyRules& rule);
+-    void setCurrentLayout(const QString& layout);
++    void setCurrentLayout(const QString& layout, const QString &variant);
+     void setError(const QString& layout="");
+     void setShowFlag(bool showFlag) { m_showFlag = showFlag; }
+ 
+--- kxkb/kcmlayout.cpp	(revision 488815)
++++ kxkb/kcmlayout.cpp	(revision 494868)
+@@ -53,6 +53,19 @@
+   return QString::null;
+ }
+ 
++static QListViewItem* copyLVI(const QListViewItem* src, QListView* parent)
++{
++    QListViewItem* ret = new QListViewItem(parent);
++    for(int i = 0; i < 3; i++)
++    {
++        ret->setText(i, src->text(i));
++        if ( src->pixmap(i) )
++            ret->setPixmap(i, *src->pixmap(i));
++    }
++    
++    return ret;
++}
++
+ OptionListItem::OptionListItem( OptionListItem *parent, const QString &text,
+     Type tt, const QString &optionName )
+     : QCheckListItem( parent, text, tt ), m_OptionName( optionName )
+@@ -146,16 +159,24 @@
+     widget->spinStickyDepth->setMaxValue( (layoutsCnt<=2) ? 2 : layoutsCnt - 1);
+ }
+ 
++const QString LayoutConfig::itemVariant(QListViewItem *item)
++{
++    return m_variants[QString::number((ptrdiff_t)item, 16)];
++}
++
+ void LayoutConfig::add()
+ {
+     QListViewItem* sel = widget->listLayoutsSrc->selectedItem();
+     if( sel == 0 )
+ 	return;
+     
+-    widget->listLayoutsSrc->takeItem(sel);
+-    widget->listLayoutsDst->insertItem(sel);
++    // Create a copy of the sel widget, as one might add the same layout more
++    // than one time, with different variants.
++    QListViewItem* toadd = copyLVI(sel, widget->listLayoutsDst);
++    
++    widget->listLayoutsDst->insertItem(toadd);
+     if( widget->listLayoutsDst->childCount() > 1 )
+-	sel->moveItem(widget->listLayoutsDst->lastItem());
++	toadd->moveItem(widget->listLayoutsDst->lastItem());
+ // disabling temporary: does not work reliable in Qt :(
+ //    widget->listLayoutsSrc->setSelected(sel, true);
+ //    layoutSelChanged(sel);
+@@ -178,8 +199,7 @@
+     if( sel->itemAbove() )
+ 	newSel = sel->itemAbove();
+ 
+-    widget->listLayoutsDst->takeItem(sel);
+-    widget->listLayoutsSrc->insertItem(sel);
++    delete sel;
+     if( newSel )
+ 	widget->listLayoutsSrc->setSelected(newSel, true);
+     layoutSelChanged(newSel);
+@@ -222,7 +242,7 @@
+     }
+ 
+     QString kbdLayout = lookupLocalized( m_rules->layouts(), selLayout->text(1) );
+-    m_variants.replace(kbdLayout, widget->comboVariant->currentText().latin1());
++    m_variants.replace(QString::number((ptrdiff_t)selLayout, 16), widget->comboVariant->currentText());
+ }
+ 
+ void LayoutConfig::latinChanged()
+@@ -277,15 +297,14 @@
+         return;
+     }
+ 
+-    char* variant = m_variants[kbdLayout];
+     widget->comboVariant->insertStringList(vars);
+ 
+-    if( variant ) {
+-      widget->comboVariant->setCurrentText(variant);
++    if( ! itemVariant(sel).isNull() ) {
++      widget->comboVariant->setCurrentText(itemVariant(sel));
+     }
+     else {
+       widget->comboVariant->setCurrentItem(0);
+-      m_variants.insert(kbdLayout, widget->comboVariant->currentText().latin1());
++      m_variants.insert(QString::number((ptrdiff_t)sel, 16), widget->comboVariant->currentText().latin1());
+     }
+ 
+     updateLayoutCommand();
+@@ -382,7 +401,6 @@
+ 
+   if( sel ) {
+     QString kbdLayout = lookupLocalized(m_rules->layouts(), sel->text(1));
+-//    char* variant = m_variants[kbdLayout];
+     QString variant = widget->comboVariant->currentText();
+ 
+     setxkbmap = "setxkbmap"; //-rules " + m_rule
+@@ -432,32 +450,30 @@
+   QString m_name = m_rules->models()[model];
+   widget->comboModel->setCurrentText(i18n(m_name.local8Bit()));
+ 
+-  QString layout = config->readEntry("Layout", "us");
+-  QString l_name = m_rules->layouts()[layout];
++  QString layvar = config->readEntry("Layout", "us(basic)");
++  QString l_name = m_rules->layouts()[m_rules->getLayout(layvar)];
+ 
+   QStringList otherLayouts = config->readListEntry("Additional");
+   if( !l_name.isEmpty() ) {
+-    otherLayouts.prepend(layout);
++    otherLayouts.prepend(layvar);
+   }
+ // to optimize we should have gone from it.end to it.begin
+   for ( QStringList::Iterator it = otherLayouts.begin(); it != otherLayouts.end(); ++it ) {
+     QListViewItemIterator src_it( widget->listLayoutsSrc );
+     for ( ; src_it.current(); ++src_it ) {
+ 	QListViewItem* srcItem = src_it.current();
+-	if ( *it == lookupLocalized(m_rules->layouts(), src_it.current()->text(1)) ) {
+-    	    widget->listLayoutsSrc->takeItem(srcItem);
+-    	    widget->listLayoutsDst->insertItem(srcItem);
+-	    srcItem->moveItem(widget->listLayoutsDst->lastItem());
++	if ( m_rules->getLayout(*it) == lookupLocalized(m_rules->layouts(), src_it.current()->text(1)) ) {
++    	    QListViewItem* newItem = copyLVI(srcItem, widget->listLayoutsDst);
++    	    widget->listLayoutsDst->insertItem(newItem);
++	    newItem->moveItem(widget->listLayoutsDst->lastItem());
++	    
++	    m_variants[QString::number((ptrdiff_t)newItem, 16)] = 
++	      m_rules->getVariant(*it, m_rules->getLayout(*it));
+ 	    break;
+ 	}
+     }
+   }
+ 
+-// reading variants
+-  QStringList vars = config->readListEntry("Variants");
+-  m_rules->parseVariants(vars, m_variants);
+-//  m_rules->parseVariants( vars, m_variants );
+-
+   QStringList incs = config->readListEntry( "Includes" );
+   m_rules->parseVariants( incs, m_includes, false );
+ 
+@@ -625,7 +641,12 @@
+   if( item ) {
+     layout = lookupLocalized(m_rules->layouts(), item->text(1));
+     if( !layout.isEmpty() )
+-	config->writeEntry("Layout", layout);
++    {
++        if ( !itemVariant(item).isNull() )
++            config->writeEntry("Layout", layout + "(" + itemVariant(item) + ")");
++        else
++	    config->writeEntry("Layout", layout);
++    }
+     item = item->nextSibling();
+   }
+   else {
+@@ -633,8 +654,10 @@
+   }
+ 
+   while (item) {
+-	QString layout = lookupLocalized(m_rules->layouts(), item->text(1));
+-	otherLayouts.append(layout);
++      QString layout = lookupLocalized(m_rules->layouts(), item->text(1));
++      if ( !itemVariant(item).isNull() )
++          layout += "(" + itemVariant(item) + ")";
++      otherLayouts.append(layout);
+       item = item->nextSibling();
+   }
+   config->writeEntry("Additional", otherLayouts);
+@@ -652,19 +675,10 @@
+         inc += ")";
+         incList.append(  inc );
+     }
+-    if( m_variants[ layout ] && m_variants[ layout ][ 0 ] != '\0' )
+-    {
+-	QString var = layout;
+-	var += "(";
+-	var += m_variants[ layout ];
+-	var += ")";
+-	varList.append( var );
+-    }
+ 
+     item = item->nextSibling();
+   }
+   config->writeEntry( "Includes", incList );
+-  config->writeEntry("Variants", varList);
+ 
+   config->writeEntry("Use", widget->chkEnable->isChecked());
+   config->writeEntry("ShowSingle", widget->chkShowSingle->isChecked());
+--- kxkb/extension.cpp	(revision 488815)
++++ kxkb/extension.cpp	(revision 494868)
+@@ -87,7 +87,7 @@
+ }
+ 
+ bool XKBExtension::setLayout(const QString& model, 
+-		const QString& layout, const char* variant, unsigned int group,
++		const QString& layout, const QString& variant, unsigned int group,
+ 		const char* baseGr)
+ {
+     if (/*rule.isEmpty() ||*/ model.isEmpty() || layout.isEmpty())
+--- kxkb/kcmlayout.h	(revision 488815)
++++ kxkb/kcmlayout.h	(revision 494868)
+@@ -69,13 +69,15 @@
+   LayoutConfigWidget* widget;
+ 
+   QDict<OptionListItem> m_optionGroups;
+-  QDict<char> m_variants;
++  QMap<QString, QString> m_variants;
+   QDict<char> m_includes;
+ //  QString m_rule;
+   KeyRules *m_rules;
+ 
+   QWidget* makeOptionsTab();
+   void updateStickyLimit();
++  
++  const QString itemVariant(QListViewItem *item);
+ };
+ 
+ 
+--- kxkb/extension.h	(revision 488815)
++++ kxkb/extension.h	(revision 494868)
+@@ -15,7 +15,7 @@
+     bool init();
+ 
+     static bool setXkbOptions(const QString& options, bool resetOldOptions);
+-    bool setLayout(const QString& model, const QString& layout, const char* variant, unsigned int group,
++    bool setLayout(const QString& model, const QString& layout, const QString& variant, unsigned int group,
+ 				const char* baseGr);
+     bool setGroup(unsigned int group);
+     unsigned int getGroup();
+--- kxkb/keyboard_layout.desktop	(revision 488815)
++++ kxkb/keyboard_layout.desktop	(revision 494868)
+@@ -170,7 +170,7 @@
+ Keywords[fa]=بین‌المللی، طرح‌بندی، صفحه
+ Keywords[fi]=Näppäimistö,Näppäimistön järjestys,Kansainvälinen
+ Keywords[fr]=clavier,disposition du clavier,périphériques d'entrée,International
+-Keywords[fy]=keyboard,toetsenbord,kaaiboerd,keyboard layout,kaaiboerdyndieling,toetsenbordindeling,input devices,invoerapparatenynfierapparaten,,randapparaten
++Keywords[fy]=keyboard,toetsenbord,toetseboerd,keyboard layout,toetseboerdyndieling,toetsenbordindeling,input devices,invoerapparaten,ynfierapparaten,randapparaten
+ Keywords[ga]=Méarchlár,Leagan Amach,Idirnáisiúnta
+ Keywords[gl]=Teclado,Tipo de teclado,Internacional
+ Keywords[he]=מקלדת,פריסה,בינלאומי, Keyboard,Layout,International
+--- kxkb/kcmmiscwidget.ui	(revision 488815)
++++ kxkb/kcmmiscwidget.ui	(revision 494868)
+@@ -133,9 +133,7 @@
+                        <number>1000</number>
+                     </property>
+                     <property name="whatsThis" stdset="0">
+-                       <string>If supported, this option allows you to set the
+-                          delay after which a pressed key will start generating keycodes. The 'Repeat rate
+-                          ' option controls the frequency of these keycodes.</string>
++                       <string>If supported, this option allows you to set the delay after which a pressed key will start generating keycodes. The 'Repeat rate' option controls the frequency of these keycodes.</string>
+                     </property>
+                 </widget>
+                 <widget class="KIntNumInput" row="1" column="2" rowspan="1" colspan="1">
+--- kxkb/keyboard.desktop	(revision 488815)
++++ kxkb/keyboard.desktop	(revision 494868)
+@@ -176,7 +176,7 @@
+ Keywords[fa]=اندازه، تکرار، دستگاه‌های ورودی، اندازه‌ی کلیک، تکرار صفحه‌کلید، صفحه‌کلید
+ Keywords[fi]=Näppäimistö,Näppäintoisto,Näppäinäänet,Syöttölaitteet,toisto, äänenvoimakkuus
+ Keywords[fr]=clavier,répétition,clics de touches,périphériques d'entrée,volume
+-Keywords[fy]=keyboard,kaaiboerd,keyboard repeat,kaaiboerd werhelling,klikvolume,klikfolume,input devices,ynfier apparaten,invoerapparaten,toetsenbord,toetsenbordherhaling,herhaling,wehelling,volume,folume,randapparatuur,internationaal,randapparaten
++Keywords[fy]=keyboard,toetseboerd,keyboard repeat,toetseboerd werhelling,klikvolume,klikfolume,input devices,ynfier apparaten,invoerapparaten,toetsenbord,toetsenbordherhaling,herhaling,werhelling,volume,folume,randapparatuur,internationaal,randapparaten
+ Keywords[gl]=Teclado,repetizón do teclado,Volume da tecla,Dispositivos de entrada,repetizón,volume
+ Keywords[he]=לוח מקשים,מקלדת,חזרה על תו,עוצמת הקשה,התקני קלט,חזרה,עצמה, Keyboard,Keyboard repeat,Click volume,Input Devices,repeat,volume
+ Keywords[hi]=कुंजीपट,कुंजी का दोहराव,क्लिक आवाज़ निर्धारक,इनपुट औज़ार,रिपीट,आवाज़ निर्धारक
+--- kxkb/rules.cpp	(revision 488815)
++++ kxkb/rules.cpp	(revision 494868)
+@@ -290,29 +290,69 @@
+     return *result;
+ }
+ 
++/**
++ * @brief Gets the single layout part of a layout(variant) string
++ * @param[in] layvar String in form layout(variant) to parse
++ * @return The layout found in the string
++ */
++const QString KeyRules::getLayout(const QString &layvar) const
++{
++  static const char* LAYOUT_PATTERN = "[a-z0-9_-]*";
++  QString varLine = layvar.stripWhiteSpace();
++  QRegExp rx(LAYOUT_PATTERN);
++  int pos = rx.search(varLine, 0);
++  int len = rx.matchedLength();
++  // check for errors
++  if( pos < 0 || len < 2 )
++    return QString::null;
++  return varLine.mid(pos, len);
++}
++
++/**
++ * @brief Gets the single variant part of a layout(variant) string
++ * @param[in] layvar String in form layout(variant) to parse
++ * @return The variant found in the string, no check is performed
++ */
++const QString KeyRules::getVariant(const QString &layvar) const
++{
++  static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)";
++  QString varLine = layvar.stripWhiteSpace();
++  QRegExp rx(VARIANT_PATTERN);
++  int pos = rx.search(varLine, 0);
++  int len = rx.matchedLength();
++  // check for errors
++  if( pos < 2 || len < 2 )
++    return QString::null;
++  return varLine.mid(pos+1, len-2);
++}
++
++/**
++ * @brief Gets the single variant part of a layout(variant) string
++ * @param[in] layvar String in form layout(variant) to parse
++ * @param[in] layout When validating the variant, use this as layout to check
++ *   against. Use QString::null to avoid validating.
++ * @return The variant found in the string, or "basic" if the variant does not
++ *   exists and layout is non-null.
++ */
++const QString KeyRules::getVariant(const QString &layvar, const QString &layout)
++{
++  QString variant_ = getVariant(layvar);
++  
++  if ( ! layout.isNull() )
++  {
++    QStringList addVars = getVariants(layout);
++    if( !addVars.contains(variant_) )
++      variant_ = "basic";
++  }
++  return variant_;
++}
++
+ void KeyRules::parseVariants(const QStringList& vars, QDict<char>& variants, bool chkVars)
+ {
+-  static const char* LAYOUT_PATTERN = "[a-z0-9_]*";
+-  static const char* VARIANT_PATTERN = "\\([a-z0-9_]*\\)";
+   for (QStringList::ConstIterator it = vars.begin(); it != vars.end(); ++it)
+   {
+-      QString varLine = (*it).stripWhiteSpace();
+-      QRegExp rx(LAYOUT_PATTERN);
+-      int pos = rx.search(varLine, 0);
+-      int len = rx.matchedLength();
+-  // check for errors
+-      if( pos < 0 || len < 2 )
+-        continue;
+-      QString layout = varLine.mid(pos, len);
+-      rx.setPattern(VARIANT_PATTERN);
+-      pos = rx.search(varLine, pos+len);
+-      len = rx.matchedLength();
+-  // check for errors
+-      if( pos < 2 || len < 2 )
+-        continue;
+-      QString variant_ = varLine.mid(pos+1, len-2);
++      QString layout = getLayout(*it), variant_ = getVariant(*it, QString::null);
+ 
+-
+       QStringList addVars = getVariants(layout);
+       if( !chkVars || (!variant_.isEmpty() && addVars.contains(variant_)) )
+       {
+--- libkonq/tests/konqdragtest.cpp	(revision 488815)
++++ libkonq/tests/konqdragtest.cpp	(revision 494868)
+@@ -12,7 +12,7 @@
+ 
+     You should have received a copy of the GNU Library General Public License
+     along with this library; see the file COPYING.LIB.  If not, write to
+-    the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
++    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
+ */
+ 
+--- libkonq/konqpopupmenuplugin.desktop	(revision 488815)
++++ libkonq/konqpopupmenuplugin.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Comment[fa]=متصل‌کننده‌ی فهرست جهنده‌ی کانکرر
+ Comment[fi]=Sovelma Konquerorin ponnahdusvalikolle
+ Comment[fr]=Module pour le menu contextuel de Konqueror
+-Comment[fy]=Plugin foar Konqueror's kontextmenu
++Comment[fy]=Plugin foar Konqueror's fluesmenu
+ Comment[gl]=Plugin para o Menu Emerxente de Konqueror
+ Comment[he]=תוסף לתפריט המוקפץ של Konqueror
+ Comment[hi]=कॉन्करर पॉपअप मेन्यू के लिए प्लगइन
+--- libkonq/konq_iconviewwidget.cc	(revision 488815)
++++ libkonq/konq_iconviewwidget.cc	(revision 494868)
+@@ -746,8 +746,10 @@
+     // TODO: Check that items->count() <= nx * ny
+ 
+     // Let have exactly nx columns and ny rows
+-    *dx = w / *nx;
+-    *dy = h / *ny;
++    if(*nx && *ny) {
++      *dx = w / *nx;
++      *dy = h / *ny;
++    }
+     kdDebug(1203) << "x=" << *x << " y=" << *y << " spacing=" << spacing() << " iconSize=" << iconSize
+                   << " w=" << w << " h=" << h
+                   << " nx=" << *nx << " ny=" << *ny
+--- libkonq/favicons/favicons.desktop	(revision 488815)
++++ libkonq/favicons/favicons.desktop	(revision 494868)
+@@ -86,7 +86,7 @@
+ Comment[eu]=Lasterbide-laukitxoen euskarria
+ Comment[fi]=Sivustojen kuvakkeet
+ Comment[fr]=Gestion d'icône de raccourci
+-Comment[fy]=Understeuning foar Ikoanen
++Comment[fy]=Understeuning foar byldkaikes
+ Comment[gl]=Soporte para Ícone de Atallo Directo
+ Comment[he]=תמיכה בסמלי קיצור דרך
+ Comment[hi]=शॉर्टकट प्रतीक आधार
+--- khotkeys/shared/soundrecorder_arts.h	(revision 488815)
++++ khotkeys/shared/soundrecorder_arts.h	(revision 494868)
+@@ -1,63 +0,0 @@
+-/***************************************************************************
+- *   Copyright (C) 2005 by Olivier Goffart   *
+- *   ogoffart at kde.org   *
+- *                                                                         *
+- *   This program is free software; you can redistribute it and/or modify  *
+- *   it under the terms of the GNU General Public License as published by  *
+- *   the Free Software Foundation; either version 2 of the License, or     *
+- *   (at your option) any later version.                                   *
+- *                                                                         *
+- *   This program is distributed in the hope that it will be useful,       *
+- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+- *   GNU General Public License for more details.                          *
+- *                                                                         *
+- *   You should have received a copy of the GNU General Public License     *
+- *   along with this program; if not, write to the                         *
+- *   Free Software Foundation, Inc.,                                       *
+- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+- ***************************************************************************/
+-#ifndef RECORDER_ARTS_H
+-#define RECORDER_ARTS_H
+-
+-#include "soundrecorder.h"
+-#include <qmemarray.h>
+-#include "sound.h"
+-
+-class  KAudioRecordStream ;
+-class KArtsServer;
+-
+-namespace KHotKeys
+-{
+-
+-
+-
+-/**
+- at author Olivier Goffart
+-*/
+-class SoundRecorderArts : public SoundRecorder
+-{
+-Q_OBJECT
+-public:
+-    SoundRecorderArts(QObject *parent = 0, const char *name = 0);
+-    virtual ~SoundRecorderArts();
+-
+-    virtual void start();
+-    virtual void stop();
+-    virtual void abort();
+-    virtual Sound sound();
+-
+-private slots:
+-    void slotDataReceived(QByteArray &data);
+-    void slotEmitSignal();
+-
+-private:
+-    QByteArray m_data;
+-    QObject *m_dis;
+-    KArtsServer *m_server;
+-    KAudioRecordStream *m_recStream;
+-};
+-
+-}
+-
+-#endif
+--- khotkeys/shared/soundrecorder_arts.cpp	(revision 488815)
++++ khotkeys/shared/soundrecorder_arts.cpp	(revision 494868)
+@@ -1,141 +0,0 @@
+-/***************************************************************************
+- *   Copyright (C) 2005 by Olivier Goffart   *
+- *   ogoffart at kde.org   *
+- *                                                                         *
+- *   This program is free software; you can redistribute it and/or modify  *
+- *   it under the terms of the GNU General Public License as published by  *
+- *   the Free Software Foundation; either version 2 of the License, or     *
+- *   (at your option) any later version.                                   *
+- *                                                                         *
+- *   This program is distributed in the hope that it will be useful,       *
+- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+- *   GNU General Public License for more details.                          *
+- *                                                                         *
+- *   You should have received a copy of the GNU General Public License     *
+- *   along with this program; if not, write to the                         *
+- *   Free Software Foundation, Inc.,                                       *
+- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+- ***************************************************************************/
+-
+-#ifdef HAVE_CONFIG_H
+-#include <config.h>
+-#endif
+-
+-#ifdef HAVE_ARTS
+-
+-#include "soundrecorder_arts.h"
+-
+-#include <arts/kaudiorecordstream.h>
+-#include <arts/kartsserver.h>
+-#include <arts/kartsdispatcher.h>
+-
+-#include <kdebug.h>
+-#include <klocale.h>
+-#include <qtimer.h>
+-
+-
+-#define FS 11025
+-#define BITS 16
+-
+-#define ABS(X) ( ((X)>0) ? (X) : -(X) )
+-
+-extern "C"
+-KDE_EXPORT
+-KHotKeys::SoundRecorder* khotkeys_soundrecorder_create( QObject* parent, const char* name )
+-{
+-    return new KHotKeys::SoundRecorderArts( parent, name );
+-}
+-
+-namespace KHotKeys
+-{
+-
+-
+-SoundRecorderArts::SoundRecorderArts(QObject *parent, const char *name)
+-	: SoundRecorder(parent, name) ,
+-	  m_dis(new KArtsDispatcher( this) ),
+-	  m_server( new KArtsServer( this ) ) ,
+-	  m_recStream( new KAudioRecordStream( m_server, i18n("khotkeys"), m_server ) )
+-{
+-        create_ptr check = khotkeys_soundrecorder_create; // check the type matches
+-        ( void ) check;
+-
+-	m_recStream->usePolling( false );
+-	connect( m_recStream, SIGNAL(data (QByteArray &)), this, SLOT(slotDataReceived(QByteArray& )));
+-}
+-
+-SoundRecorderArts::~SoundRecorderArts()
+-{
+-	delete m_recStream;
+-	delete m_server;
+-	delete m_dis;
+-}
+-
+-void SoundRecorderArts::start()
+-{
+-	m_recStream->start(FS,BITS,2);
+-	m_data.resize(0);
+-}
+-
+-void SoundRecorderArts::stop()
+-{
+-	m_recStream->stop();
+-	QTimer::singleShot(400,this,SLOT(slotEmitSignal()));
+-}
+-
+-void SoundRecorderArts::abort()
+-{
+-	m_recStream->stop();
+-	m_data.resize(0);
+-}
+-
+-
+-Sound SoundRecorderArts::sound()
+-{
+-	Sound s;
+-	uint BytePS=BITS/8;
+-	uint length=m_data.size()/BytePS;
+-	QMemArray<Q_INT32> da(length);
+-	s.max=0;
+-	s._fs=FS;
+-	for(uint f=0;f<length; f++)
+-	{
+-#if BITS==8
+-		int nb=(unsigned char)(m_data[f])  -128;
+-#elif BITS==16
+-		int nb=(m_data[2*f] &0x000000FF )  |  ( (m_data[2*f+1] &0x000000FF ) << 8 )    ;
+-		if(nb & (1<< 15)) 
+-			nb = nb-(1<<16);
+-#else
+-	#error  BITS is not 16 or 8
+-#endif
+-		if(s.max < (uint)ABS(nb))
+-		{
+-			s.max= (uint)ABS(nb);
+-		}
+-		da[f]=nb;
+-	}
+-	s.data=da;
+-	return s;
+-}
+-
+-void SoundRecorderArts::slotDataReceived(QByteArray & data)
+-{
+-	uint pos=m_data.size();
+-	m_data.resize(pos + data.size());
+-	for(uint f=0;f<data.size(); f++)
+-	{
+-		m_data[pos+f]=data[f];
+-	}
+-}
+-
+-void SoundRecorderArts::slotEmitSignal()
+-{
+-	emit recorded( sound() );
+-}
+-
+-}
+-
+-#include "soundrecorder_arts.moc"
+-
+-#endif
+--- khotkeys/shared/actions.cpp	(revision 488815)
++++ khotkeys/shared/actions.cpp	(revision 494868)
+@@ -159,9 +159,9 @@
+ 		return;
+             if( !KRun::runCommand(
+                 cmd + ( uri.hasArgsAndOptions() ? uri.argsAndOptions() : "" ),
+-                cmd, uri.iconName()))
++                cmd, uri.iconName())) {
+                 // CHECKME ?
+-                ;
++             }
+           break;
+             }
+         default: // error
+--- khotkeys/shared/soundrecorder.cpp	(revision 488815)
++++ khotkeys/shared/soundrecorder.cpp	(revision 494868)
+@@ -15,7 +15,7 @@
+  *   You should have received a copy of the GNU General Public License     *
+  *   along with this program; if not, write to the                         *
+  *   Free Software Foundation, Inc.,                                       *
+- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
++ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
+  ***************************************************************************/
+ 
+ #ifdef HAVE_CONFIG_H
+--- khotkeys/shared/khotkeysglobal.cpp	(revision 488815)
++++ khotkeys/shared/khotkeysglobal.cpp	(revision 494868)
+@@ -83,13 +83,18 @@
+     if( have_arts == -1 )
+         {
+         have_arts = 0;
+-        KLibrary* arts = KLibLoader::self()->globalLibrary( "khotkeys_shared_arts" );
++        KLibrary* arts = KLibLoader::self()->library( "khotkeys_arts" );
+         if( arts == NULL )
+-            kdDebug( 1217 ) << "Couldn't load khotkeys_shared_arts:" << KLibLoader::self()->lastErrorMessage() << endl;
++            kdDebug( 1217 ) << "Couldn't load khotkeys_arts:" << KLibLoader::self()->lastErrorMessage() << endl;
+         if( arts != NULL && SoundRecorder::init( arts ))
+             have_arts = 1;
+         }
+     return have_arts != 0;
+     }
+ 
++void disableArts()
++    {
++    have_arts = 0;
++    }
++
+ } // namespace KHotKeys
+--- khotkeys/shared/soundrecorder.h	(revision 488815)
++++ khotkeys/shared/soundrecorder.h	(revision 494868)
+@@ -15,7 +15,7 @@
+  *   You should have received a copy of the GNU General Public License     *
+  *   along with this program; if not, write to the                         *
+  *   Free Software Foundation, Inc.,                                       *
+- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
++ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
+  ***************************************************************************/
+ #ifndef RECORDER_H
+ #define RECORDER_H
+--- khotkeys/shared/khotkeysglobal.h	(revision 488815)
++++ khotkeys/shared/khotkeysglobal.h	(revision 494868)
+@@ -48,6 +48,7 @@
+ const char* const MENU_EDITOR_ENTRIES_GROUP_NAME = I18N_NOOP( "Menu Editor entries" );
+ 
+ KDE_EXPORT bool haveArts();
++KDE_EXPORT void disableArts();
+ 
+ //***************************************************************************
+ // Inline
+--- khotkeys/shared/voicesignature.cpp	(revision 488815)
++++ khotkeys/shared/voicesignature.cpp	(revision 494868)
+@@ -15,7 +15,7 @@
+  *   You should have received a copy of the GNU General Public License     *
+  *   along with this program; if not, write to the                         *
+  *   Free Software Foundation, Inc.,                                       *
+- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
++ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
+  ***************************************************************************/
+ #include "voicesignature.h"
+ #include "sound.h"
+@@ -31,6 +31,12 @@
+ #include <kdebug.h>
+ #include <qdatetime.h>
+ 
++#undef Complex
++
++namespace KHotKeys
++{
++
++
+ inline static float ABS(float X)
+ {
+ 	return (X>0) ? X : -X ;
+@@ -193,13 +199,10 @@
+ 
+ 
+ 
+-namespace KHotKeys
+-{
+ 
+-
+ QMemArray<double> VoiceSignature::fft(const Sound& sound, unsigned int start, unsigned int stop)
+ {
+-	return ::fft(sound, start, stop);
++	return KHotKeys::fft(sound, start, stop);
+ 	/*QMemArray<double> result(8000);
+ 	for(int f=0; f<8000;f++)
+ 	{
+--- khotkeys/shared/Makefile.am	(revision 488815)
++++ khotkeys/shared/Makefile.am	(revision 494868)
+@@ -1,6 +1,4 @@
+-KDE_OPTIONS = nofinal
+ lib_LTLIBRARIES = libkhotkeys_shared.la
+-kde_module_LTLIBRARIES = khotkeys_shared_arts.la
+ 
+ libkhotkeys_shared_la_SOURCES = action_data.cpp khotkeysglobal.cpp triggers.cpp windows.cpp \
+     settings.cpp actions.cpp input.cpp conditions.cpp khlistview.cpp khlistbox.cpp \
+@@ -8,14 +6,10 @@
+ libkhotkeys_shared_la_LIBADD  = $(LIB_KIO) $(XTESTLIB) -lXext -lX11 $(X_PRE_LIBS)
+ libkhotkeys_shared_la_LDFLAGS = $(all_libraries) $(X_LDFLAGS) -version-info 1:0:0 -no-undefined
+ 
+-khotkeys_shared_arts_la_SOURCES = soundrecorder_arts.cpp
+-khotkeys_shared_arts_la_LIBADD  = libkhotkeys_shared.la $(LIB_ARTS)
+-khotkeys_shared_arts_la_LDFLAGS = $(all_libraries) $(X_LDFLAGS) -module -avoid-version -no-undefined
+-
+ INCLUDES = $(all_includes)
+ 
+ noinst_HEADERS = action_data.h khotkeysglobal.h triggers.h windows.h actions.h input.h \
+     settings.h conditions.h khlistview.h khlistbox.h gestures.h voices.h \
+-    voicesignature.h sound.h soundrecorder.h soundrecorder_arts.h
++    voicesignature.h sound.h soundrecorder.h
+ 
+ METASOURCES = AUTO
+--- khotkeys/shared/sound.cpp	(revision 488815)
++++ khotkeys/shared/sound.cpp	(revision 494868)
+@@ -15,7 +15,7 @@
+  *   You should have received a copy of the GNU General Public License     *
+  *   along with this program; if not, write to the                         *
+  *   Free Software Foundation, Inc.,                                       *
+- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
++ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
+  ***************************************************************************/
+ 
+ #include "sound.h"
+--- khotkeys/shared/voicesignature.h	(revision 488815)
++++ khotkeys/shared/voicesignature.h	(revision 494868)
+@@ -15,7 +15,7 @@
+  *   You should have received a copy of the GNU General Public License     *
+  *   along with this program; if not, write to the                         *
+  *   Free Software Foundation, Inc.,                                       *
+- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
++ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
+  ***************************************************************************/
+ #ifndef SIGNATURE_H
+ #define SIGNATURE_H
+--- khotkeys/shared/sound.h	(revision 488815)
++++ khotkeys/shared/sound.h	(revision 494868)
+@@ -15,7 +15,7 @@
+  *   You should have received a copy of the GNU General Public License     *
+  *   along with this program; if not, write to the                         *
+  *   Free Software Foundation, Inc.,                                       *
+- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
++ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
+  ***************************************************************************/
+ #ifndef SOUND_H
+ #define SOUND_H
+--- khotkeys/Makefile.am	(revision 488815)
++++ khotkeys/Makefile.am	(revision 494868)
+@@ -1,4 +1,4 @@
+-SUBDIRS = shared kcontrol app data update
++SUBDIRS = shared kcontrol app data update $(KHOTKEYS_ARTS_SUBDIR)
+ 
+ khotkeys_autostart_DATA = khotkeys.desktop
+ khotkeys_autostartdir = $(datadir)/autostart
+--- khotkeys/arts/voicerecorder_arts.cpp	(revision 0)
++++ khotkeys/arts/voicerecorder_arts.cpp	(revision 494868)
+@@ -0,0 +1,40 @@
++/****************************************************************************
++
++ KHotKeys
++ 
++ Copyright (C) 2005 Olivier Goffgart <ogoffart @ kde.org>
++
++ Distributed under the terms of the GNU General Public License version 2.
++ 
++****************************************************************************/
++
++#include <qcolor.h>
++#include <qevent.h>
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include "voicerecorder.h"
++
++#ifdef HAVE_ARTS
++
++#include <arts/kplayobject.h>
++#include <arts/kartsserver.h>
++#include <arts/kartsdispatcher.h>
++#include <arts/kplayobjectfactory.h>
++
++extern "C"
++KDE_EXPORT
++void khotkeys_voicerecorder_arts_play( const QString& file )
++{
++        KHotKeys::VoiceRecorder::arts_play_fun check = khotkeys_voicerecorder_arts_play; // check the type matches
++        ( void ) check;
++	KArtsDispatcher dispatcher;
++	KArtsServer server;
++	KDE::PlayObjectFactory factory( server.server() );
++	KDE::PlayObject* playobj = factory.createPlayObject( file, true );
++	playobj->play();
++}
++
++#endif
+--- khotkeys/arts/soundrecorder_arts.cpp	(revision 0)
++++ khotkeys/arts/soundrecorder_arts.cpp	(revision 494868)
+@@ -0,0 +1,141 @@
++/***************************************************************************
++ *   Copyright (C) 2005 by Olivier Goffart   *
++ *   ogoffart at kde.org   *
++ *                                                                         *
++ *   This program is free software; you can redistribute it and/or modify  *
++ *   it under the terms of the GNU General Public License as published by  *
++ *   the Free Software Foundation; either version 2 of the License, or     *
++ *   (at your option) any later version.                                   *
++ *                                                                         *
++ *   This program is distributed in the hope that it will be useful,       *
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
++ *   GNU General Public License for more details.                          *
++ *                                                                         *
++ *   You should have received a copy of the GNU General Public License     *
++ *   along with this program; if not, write to the                         *
++ *   Free Software Foundation, Inc.,                                       *
++ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
++ ***************************************************************************/
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#ifdef HAVE_ARTS
++
++#include "soundrecorder_arts.h"
++
++#include <arts/kaudiorecordstream.h>
++#include <arts/kartsserver.h>
++#include <arts/kartsdispatcher.h>
++
++#include <kdebug.h>
++#include <klocale.h>
++#include <qtimer.h>
++
++
++#define FS 11025
++#define BITS 16
++
++#define ABS(X) ( ((X)>0) ? (X) : -(X) )
++
++extern "C"
++KDE_EXPORT
++KHotKeys::SoundRecorder* khotkeys_soundrecorder_create( QObject* parent, const char* name )
++{
++    return new KHotKeys::SoundRecorderArts( parent, name );
++}
++
++namespace KHotKeys
++{
++
++
++SoundRecorderArts::SoundRecorderArts(QObject *parent, const char *name)
++	: SoundRecorder(parent, name) ,
++	  m_dis(new KArtsDispatcher( this) ),
++	  m_server( new KArtsServer( this ) ) ,
++	  m_recStream( new KAudioRecordStream( m_server, i18n("khotkeys"), m_server ) )
++{
++        create_ptr check = khotkeys_soundrecorder_create; // check the type matches
++        ( void ) check;
++
++	m_recStream->usePolling( false );
++	connect( m_recStream, SIGNAL(data (QByteArray &)), this, SLOT(slotDataReceived(QByteArray& )));
++}
++
++SoundRecorderArts::~SoundRecorderArts()
++{
++	delete m_recStream;
++	delete m_server;
++	delete m_dis;
++}
++
++void SoundRecorderArts::start()
++{
++	m_recStream->start(FS,BITS,2);
++	m_data.resize(0);
++}
++
++void SoundRecorderArts::stop()
++{
++	m_recStream->stop();
++	QTimer::singleShot(400,this,SLOT(slotEmitSignal()));
++}
++
++void SoundRecorderArts::abort()
++{
++	m_recStream->stop();
++	m_data.resize(0);
++}
++
++
++Sound SoundRecorderArts::sound()
++{
++	Sound s;
++	uint BytePS=BITS/8;
++	uint length=m_data.size()/BytePS;
++	QMemArray<Q_INT32> da(length);
++	s.max=0;
++	s._fs=FS;
++	for(uint f=0;f<length; f++)
++	{
++#if BITS==8
++		int nb=(unsigned char)(m_data[f])  -128;
++#elif BITS==16
++		int nb=(m_data[2*f] &0x000000FF )  |  ( (m_data[2*f+1] &0x000000FF ) << 8 )    ;
++		if(nb & (1<< 15)) 
++			nb = nb-(1<<16);
++#else
++	#error  BITS is not 16 or 8
++#endif
++		if(s.max < (uint)ABS(nb))
++		{
++			s.max= (uint)ABS(nb);
++		}
++		da[f]=nb;
++	}
++	s.data=da;
++	return s;
++}
++
++void SoundRecorderArts::slotDataReceived(QByteArray & data)
++{
++	uint pos=m_data.size();
++	m_data.resize(pos + data.size());
++	for(uint f=0;f<data.size(); f++)
++	{
++		m_data[pos+f]=data[f];
++	}
++}
++
++void SoundRecorderArts::slotEmitSignal()
++{
++	emit recorded( sound() );
++}
++
++}
++
++#include "soundrecorder_arts.moc"
++
++#endif
+--- khotkeys/arts/Makefile.am	(revision 0)
++++ khotkeys/arts/Makefile.am	(revision 494868)
+@@ -0,0 +1,11 @@
++kde_module_LTLIBRARIES = khotkeys_arts.la
++
++khotkeys_arts_la_SOURCES = soundrecorder_arts.cpp voicerecorder_arts.cpp
++khotkeys_arts_la_LIBADD  = ../shared/libkhotkeys_shared.la $(LIB_ARTS)
++khotkeys_arts_la_LDFLAGS = $(all_libraries) $(X_LDFLAGS) -module -avoid-version -no-undefined
++
++INCLUDES = $(all_includes) -I$(srcdir)/../shared/ -I$(srcdir)/../kcontrol -I../kcontrol
++
++noinst_HEADERS = soundrecorder_arts.h
++
++METASOURCES = AUTO
+--- khotkeys/arts/soundrecorder_arts.h	(revision 0)
++++ khotkeys/arts/soundrecorder_arts.h	(revision 494868)
+@@ -0,0 +1,63 @@
++/***************************************************************************
++ *   Copyright (C) 2005 by Olivier Goffart   *
++ *   ogoffart at kde.org   *
++ *                                                                         *
++ *   This program is free software; you can redistribute it and/or modify  *
++ *   it under the terms of the GNU General Public License as published by  *
++ *   the Free Software Foundation; either version 2 of the License, or     *
++ *   (at your option) any later version.                                   *
++ *                                                                         *
++ *   This program is distributed in the hope that it will be useful,       *
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
++ *   GNU General Public License for more details.                          *
++ *                                                                         *
++ *   You should have received a copy of the GNU General Public License     *
++ *   along with this program; if not, write to the                         *
++ *   Free Software Foundation, Inc.,                                       *
++ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
++ ***************************************************************************/
++#ifndef RECORDER_ARTS_H
++#define RECORDER_ARTS_H
++
++#include "soundrecorder.h"
++#include <qmemarray.h>
++#include "sound.h"
++
++class  KAudioRecordStream ;
++class KArtsServer;
++
++namespace KHotKeys
++{
++
++
++
++/**
++ at author Olivier Goffart
++*/
++class SoundRecorderArts : public SoundRecorder
++{
++Q_OBJECT
++public:
++    SoundRecorderArts(QObject *parent = 0, const char *name = 0);
++    virtual ~SoundRecorderArts();
++
++    virtual void start();
++    virtual void stop();
++    virtual void abort();
++    virtual Sound sound();
++
++private slots:
++    void slotDataReceived(QByteArray &data);
++    void slotEmitSignal();
++
++private:
++    QByteArray m_data;
++    QObject *m_dis;
++    KArtsServer *m_server;
++    KAudioRecordStream *m_recStream;
++};
++
++}
++
++#endif
+--- khotkeys/configure.in.in	(revision 488815)
++++ khotkeys/configure.in.in	(revision 494868)
+@@ -87,10 +87,13 @@
+ 	ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
+ 	ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts"
+ 	AC_DEFINE(HAVE_ARTS, 1, [Defined for arts support in khotkeys])
++        KHOTKEYS_ARTS_SUBDIR=arts
+ else
+ 	LIB_ARTS=""
+ 	ARTS_CFLAGS=""
++        KHOTKEYS_ARTS_SUBDIR=
+ fi
+ 
+ AC_SUBST(LIB_ARTS)
+ AC_SUBST(ARTS_CFLAGS)
++AC_SUBST(KHOTKEYS_ARTS_SUBDIR)
+--- khotkeys/kcontrol/voicerecorder.h	(revision 488815)
++++ khotkeys/kcontrol/voicerecorder.h	(revision 494868)
+@@ -20,6 +20,7 @@
+ class  KAudioRecordStream ;
+ class KArtsServer;
+ class KTempFile;
++class KLibrary;
+ 
+ namespace KHotKeys
+ {
+@@ -32,19 +33,21 @@
+     Q_OBJECT
+ 
+     public:
+-		VoiceRecorder(const Sound& sound_P, const QString &voiceId, QWidget *parent, const char *name);
++        VoiceRecorder(const Sound& sound_P, const QString &voiceId, QWidget *parent, const char *name);
+         ~VoiceRecorder();
+ 
+-		Sound sound() const;
++        Sound sound() const;
+ 		
+-		enum State { sNotModified , sIncorrect, sModified  };
++        enum State { sNotModified , sIncorrect, sModified  };
+ 
+-		inline State state() const
+-		{
+-			return _state;
+-		}
++        inline State state() const
++            {
++            return _state;
++            }
++            
++        static bool init( KLibrary* lib );
++        typedef void (*arts_play_fun)( const QString& file );
+ 
+-
+     protected slots:
+         void slotStopPressed();
+         void slotRecordPressed();
+@@ -53,15 +56,16 @@
+     signals:
+         void recorded(bool);
+ 	private slots:
+-		void slotSoundRecorded(const Sound& sound);
+-		bool drawSound();
++        void slotSoundRecorded(const Sound& sound);
++        bool drawSound();
+ 
+-	private:
+-		SoundRecorder *_recorder;
+-		Sound _sound;
+-		State _state;
+-		KTempFile *_tempFile;
+-		QString _voiceId;
++    private:
++        SoundRecorder *_recorder;
++        Sound _sound;
++        State _state;
++        KTempFile *_tempFile;
++        QString _voiceId;
++        static arts_play_fun arts_play;
+     };
+ 
+ } // namespace KHotKeys
+--- khotkeys/kcontrol/tab_widget.cpp	(revision 488815)
++++ khotkeys/kcontrol/tab_widget.cpp	(revision 494868)
+@@ -77,11 +77,12 @@
+          i < TAB_END;
+          ++i )
+         connect( this, SIGNAL( clear_pages_signal()), pages[ i ], SLOT( clear_data()));
+-    show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS
+ #ifdef HAVE_ARTS
+-			, TAB_VOICE_SETTINGS
++    if( haveArts())
++        show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS, TAB_VOICE_SETTINGS ));
++    else
+ #endif
+-			   ));
++        show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS ));
+     current_type = NONE;
+     current_data_type = TYPE_GENERIC;
+     }
+@@ -342,11 +343,12 @@
+         kdDebug( 1217 ) << "setting none" << endl;
+         if( current_type == NONE )
+             return;
+-        show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS
+-#ifdef HAVE_ARTS				
+-				, TAB_VOICE_SETTINGS
++#ifdef HAVE_ARTS
++        if( haveArts())
++            show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS, TAB_VOICE_SETTINGS ));
++        else
+ #endif
+-				   ));
++            show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS ));
+         current_type = NONE;
+         return;
+         }
+--- khotkeys/kcontrol/voicerecorder.cpp	(revision 488815)
++++ khotkeys/kcontrol/voicerecorder.cpp	(revision 494868)
+@@ -15,6 +15,7 @@
+ #include "soundrecorder.h"
+ #include "voicesignature.h"
+ #include "voices.h"
++#include "khotkeysglobal.h"
+ #include <kpushbutton.h>
+ #include <klineedit.h>
+ #include <klocale.h>
+@@ -22,26 +23,28 @@
+ #include <qlabel.h>
+ #include <qpainter.h>
+ #include <kmessagebox.h>
+-
++#include <klibloader.h>
+ #include <kstandarddirs.h>
+ 
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+ 
++namespace KHotKeys
++{
+ 
+-#ifdef HAVE_ARTS
++VoiceRecorder::arts_play_fun VoiceRecorder::arts_play = NULL;
+ 
+-#include <arts/kplayobject.h>
+-#include <arts/kartsserver.h>
+-#include <arts/kartsdispatcher.h>
+-#include <arts/kplayobjectfactory.h>
+-
++bool VoiceRecorder::init( KLibrary* lib )
++{
++#ifdef HAVE_ARTS
++    if( arts_play == NULL && lib != NULL )
++        arts_play = (arts_play_fun) lib->symbol( "khotkeys_voicerecorder_arts_play" );
+ #endif
++//    kdDebug( 1217 ) << "voicerecorder:" << arts_play << ":" << lib << endl;
++    return arts_play != NULL;
++}
+ 
+-namespace KHotKeys
+-{
+-
+ VoiceRecorder::VoiceRecorder(const Sound& sound_P, const QString &voiceId, QWidget *parent, const char *name)
+ 	: Voice_input_widget_ui(parent, name) , _recorder( SoundRecorder::create(this)) , _state(sNotModified), _tempFile(0L) ,  _voiceId(voiceId)
+ {
+@@ -68,7 +71,7 @@
+        buttonPlay->setEnabled(false);
+        buttonStop->setEnabled(true);
+       _recorder->start();
+-       label->setText(i18n("Recording ..."));
++       label->setText(i18n("Recording..."));
+ }
+ 
+ void VoiceRecorder::slotStopPressed()
+@@ -82,14 +85,12 @@
+ void VoiceRecorder::slotPlayPressed()
+ {
+ #ifdef HAVE_ARTS
++        if( !haveArts() || arts_play == NULL )
++            return;
+ 	/*if(!_modified)
+ 	{
+ 		QString fileName = locateLocal( "appdata", _original_voiuceid +  ".wav"  );
+-		KArtsDispatcher dispatcher;
+-		KArtsServer server;
+-		KDE::PlayObjectFactory factory( server.server() );
+-		KDE::PlayObject* playobj = factory.createPlayObject(fileName, true );
+-		playobj->play();
++                arts_play( fileName );
+ 	}
+ 	else
+ 	{*/
+@@ -99,11 +100,7 @@
+ 		_tempFile->setAutoDelete(true);
+ 	}
+ 	_sound.save(_tempFile->name());
+-	KArtsDispatcher dispatcher;
+-	KArtsServer server;
+-	KDE::PlayObjectFactory factory( server.server() );
+-	KDE::PlayObject* playobj = factory.createPlayObject(_tempFile->name(), true );
+-	playobj->play();
++        arts_play( _tempFile->name());
+ #endif
+ }
+ 
+@@ -124,14 +121,14 @@
+ 		QString vm=voice_handler->isNewSoundFarEnough( VoiceSignature(sound), _voiceId);
+ 		if(!vm.isNull())
+ 		{
+-			KMessageBox::sorry (this, i18n("The word you recorded is too close to the existing reference '%1', please record another word.").arg(vm) );
++			KMessageBox::sorry (this, i18n("The word you recorded is too close to the existing reference '%1'. Please record another word.").arg(vm) );
+ 			//TODO: messagebox saying there are too much noise	
+ 			correct=false;
+ 		}
+ 	}
+ 	else
+ 	{
+-		KMessageBox::sorry (this, i18n("Unable to extract voice information from noise.\n  If this message happens too often it means there is too much noice, or that your microphone is not good enough.") );
++		KMessageBox::sorry (this, i18n("Unable to extract voice information from noise.\nIf this error occurs repeatedly, it suggests that there is either too much background noise, or the quality of your microphone is too poor.") );
+ 	}
+ 		
+ 	_state=correct ? sModified : sIncorrect;
+--- khotkeys/kcontrol/kcmkhotkeys.h	(revision 488815)
++++ khotkeys/kcontrol/kcmkhotkeys.h	(revision 494868)
+@@ -60,6 +60,7 @@
+         void changed();
+     protected:
+         void set_new_current_action( bool save_old_P );
++        void init_arts();
+         Actions_listview_widget* actions_listview_widget;
+         Tab_widget* tab_widget;
+         Main_buttons_widget* buttons_widget;
+--- khotkeys/kcontrol/voicerecordpage.cpp	(revision 488815)
++++ khotkeys/kcontrol/voicerecordpage.cpp	(revision 494868)
+@@ -28,7 +28,7 @@
+ VoiceRecordPage::VoiceRecordPage( const QString &voiceid_P, QWidget *parent, const char *name)
+ 	: QVBox(parent, name) , _original_voiceId(voiceid_P)
+    {
+-	  _message = i18n("Enter a code for the sound (eg: the word you are saying) and record twice the same word");
++	  _message = i18n("Enter a code for the sound (e.g. the word you are saying) and record the same word twice.");
+ 
+     _label = new QLabel(_message, this, "label");
+     _label->setAlignment(QLabel::AlignLeft | QLabel::WordBreak |
+--- khotkeys/kcontrol/khotkeys.desktop	(revision 488815)
++++ khotkeys/kcontrol/khotkeys.desktop	(revision 494868)
+@@ -73,7 +73,7 @@
+ Comment[eu]=Konfiguratu Hotkey-ren ezarpenak
+ Comment[fi]=Muokkaa pikanäppäinten asetuksia
+ Comment[fr]=Configurer les réglages des raccourcis-clavier
+-Comment[fy]=Snelkaaien ynstelle
++Comment[fy]=Fluchtoetsen ynstelle
+ Comment[gl]=Configurar opzóns de HotKeys
+ Comment[he]=שינוי הגדרות מקשי הקיצור
+ Comment[hi]=हॉट-की विन्यास कॉन्फ़िगर करें 
+@@ -127,7 +127,7 @@
+ Keywords[eu]=Teklak,Tekla elkarketa orokorrak,Tekla elkarketak,Keinuak,Saguaren keinuak
+ Keywords[fi]=Näppäimet,Yleiset näppäinsidokset,Näppäinteema,Näppäinsidokset,pikavalinnat,sovellusten pikavalinnat,hiirieleet
+ Keywords[fr]=touches,raccourcis clavier globaux,raccourcis clavier,gestes,gestes de la souris
+-Keywords[fy]=keys,toetsen,kaaien,toetsenbindingen,key bindings,kaaibiningen,sneltoetsen,fluchtoetsen,snelkaaien,globale toetsenbindingen,algemiene kaaibiningen,mouse gestures,muisgebaren,mûsstjoeringen,stjoeringen,gestures,gebaren
++Keywords[fy]=keys,toetsen,toetsenbindingen,key bindings,toetsbiningen,sneltoetsen,fluchtoetsen,globale toetsenbindingen,algemiene toetsbiningen,mouse gestures,muisgebaren,mûsstjoeringen,stjoeringen,gestures,gebaren
+ Keywords[ga]=Eochracha,Ceangail chomhchoiteanna eochracha,Ceangail chomhchoiteanna,Gothaí,Gothaí luiche
+ Keywords[gl]=Teclas,Atallos de teclado globais,Atallos de teclado,Xestos,Xestos co rato
+ Keywords[he]=מקשים,תפקידי מקשים גלובליים,תצורת מקשים,תפקידי מקשים,קיצורים,קיצורים של יישומים, Keys,Global key bindings,Key bindings,Gestures,Mouse gestures
+--- khotkeys/kcontrol/kcmkhotkeys.cpp	(revision 488815)
++++ khotkeys/kcontrol/kcmkhotkeys.cpp	(revision 494868)
+@@ -35,6 +35,7 @@
+ #include <ksimpleconfig.h>
+ #include <kfiledialog.h>
+ #include <dcopref.h>
++#include <klibloader.h>
+ 
+ #include <input.h>
+ #include <triggers.h>
+@@ -43,6 +44,7 @@
+ #include "tab_widget.h"
+ #include "actions_listview_widget.h"
+ #include "main_buttons_widget.h"
++#include "voicerecorder.h"
+ 
+ extern "C"
+ {
+@@ -66,6 +68,7 @@
+     setButtons( Help | Cancel | Apply | Ok );
+     module = this;
+     init_global_data( false, this ); // don't grab keys
++    init_arts();
+     QVBoxLayout* vbox = new QVBoxLayout( this ); 
+     vbox->setSpacing( 6 );
+     vbox->setMargin( 11 );
+@@ -292,6 +295,22 @@
+     emit KCModule::changed( true );
+     }
+ 
++void Module::init_arts()
++    {
++#ifdef HAVE_ARTS
++    if( haveArts())
++        {
++        KLibrary* arts = KLibLoader::self()->library( "khotkeys_arts" );
++        if( arts == NULL )
++            kdDebug( 1217 ) << "Couldn't load khotkeys_arts:" << KLibLoader::self()->lastErrorMessage() << endl;
++        if( arts != NULL && VoiceRecorder::init( arts ))
++            ; // ok
++        else
++            disableArts();
++        }
++#endif
++    }
++
+ Module* module; // CHECKME
+ 
+ } // namespace KHotKeys
+--- khotkeys/kcontrol/ui/voice_settings_tab_ui.ui	(revision 488815)
++++ khotkeys/kcontrol/ui/voice_settings_tab_ui.ui	(revision 494868)
+@@ -21,7 +21,7 @@
+                 <cstring>textLabel2</cstring>
+             </property>
+             <property name="text">
+-                <string>In order to trigger a spoken action, you have to press the key (or combinaison of key) configured bellow, speak, and press again the same shortcut when you have finished your spoken command</string>
++                <string>In order to trigger a spoken action, you have to press the key (or combination of keys) configured below, speak the command and then press the same key again once you have finished speaking.</string>
+             </property>
+             <property name="alignment">
+                 <set>WordBreak|AlignVCenter</set>
+@@ -92,8 +92,8 @@
+                 <cstring>textLabel1_2</cstring>
+             </property>
+             <property name="text">
+-                <string>&lt;b&gt;Note:&lt;/b&gt; To get voice recognition running correctly, you need &lt;i&gt;arts&lt;/i&gt; working correctly , and in full duplex mode : 
+-Make sure the &lt;i&gt;full duplex&lt;/i&gt; checkbox of your &lt;i&gt;sound server&lt;/i&gt; options is checked.</string>
++                <string>&lt;b&gt;Note:&lt;/b&gt; To get voice recognition working correctly and in full duplex mode: 
++make sure &lt;i&gt;Full duplex&lt;/i&gt; is checked in your &lt;i&gt;Sound System&lt;/i&gt; options.</string>
+             </property>
+         </widget>
+     </vbox>
+--- drkonqi/presets/enduserrc	(revision 488815)
++++ drkonqi/presets/enduserrc	(revision 494868)
+@@ -244,7 +244,7 @@
+ Name[ca]=Potser voldreu enviar un informe d'error per a aquesta aplicació. Comproveu si està a la llista de http://bugs.kde.org, altrament envieu un correu a l'autor. Afegiu tanta informació com sigui possible, potser els documents originals. Si teniu una manera de reproduir l'error, afegiu-la també.
+ Name[cs]=Možná budete chtít zaslat nahlášení chyby autorovi. Nejdříve zkontrolujte, zda-li je chyba zapsaná na stránce http://bugs.kde.org, jinak pošlete autorovi email. Prosím vložte co nejvíce informací, případně i původní dokument. Znáte-li způsob, jak znovu vyvolat chybu, tak jej též popište.
+ Name[cy]=Efallai y dymunwch yrru adroddiad o'r nam i'r awdur. Cywirwch os mae o wedi'i restru ar http://bugs.kde.org, neu anfonwch ebost i'r awdur.  Ceisiwch gynnwys cyn gymaint o wybodaeth â phosibl, ac efallai'r dogfennau gwreiddiol. Os oes modd i chi ail-greu'r gwall, cynhwyswch hwn hefyd.
+-Name[da]=Måske har du lyst til at sende en fejlrapport om dette program. Tjek om fejlen allerede er der på  listen ihttp://bugs.kde.org, skriv ellers til forfatteren. Husk at inkludere så meget information som muligt, måske de oprindelige dokumenter. Hvis du er i stand til at reproducere fejlen, så husk også at nævne dette.
++Name[da]=Måske har du lyst til at sende en fejlrapport om dette program. Tjek om fejlen allerede er listet på http://bugs.kde.org, skriv ellers til forfatteren. Husk at inkludere så meget information som muligt, måske de oprindelige dokumenter. Hvis du er i stand til at reproducere fejlen, så husk også at nævne dette.
+ Name[de]=Vielleicht möchten Sie einen Problembericht (Bug Report) für dieses Programm erstellen? Bitte überprüfen Sie in diesem Fall, ob es unter http://bugs.kde.org aufgeführt ist, sonst schreiben Sie bitte eine Mail an den Autor (im Zweifelsfall auf Englisch). Geben Sie so viele Informationen wie möglich, die zur Reproduktion des Problems beitragen können, evtl. einschließlich der Dokumente, bei denen es auftritt.
+ Name[el]=Ίσως θέλετε να στείλετε μια αναφορά σφάλματος γι' αυτήν την εφαρμογή. Ελέγξτε εάν είναι καταχωρημένη στο http://bugs.kde.org αλλιώς στείλετε email στο συγγραφέα. Παρακαλώ συμπεριλάβετε τη μέγιστη δυνατή πληροφορία, ίσως και τα αυθεντικά έγγραφα. Εάν έχετε κάποιον τρόπο να αναπαραχθεί το σφάλμα, συμπεριλάβετέ τον.
+ Name[eo]=Vi povus sendi eraroraporton pri ĉi tiu aplikaĵo. Kontrolu ĉu la listo ĉe http://bugs.kde.org jam enhavas ĝin, alie sendu retpoŝton al la aŭtoro. Bonvolu kunsendi tiom da informoj, kiom eblas, laŭeble la originalajn dokumentojn. Se vi trovis manieron reprodukti la eraron, bonvolu krome aldoni ĝin.
+--- drkonqi/debuggers/gdbrc	(revision 488815)
++++ drkonqi/debuggers/gdbrc	(revision 494868)
+@@ -58,7 +58,7 @@
+ Name[th]=ตัวดีบักของ GNU
+ Name[tr]=GNU Hata Ayıklayıcı
+ Name[tt]=GNU Betçe
+-Name[uk]=Зневаджувач GNU
++Name[uk]=Зневадник GNU
+ Name[uz]=GNU дебаггер
+ Name[vi]=Trình gỡ rối GNU 
+ Name[wa]=Disbugueu GNU
+@@ -131,7 +131,7 @@
+ Comment[th]=ดีบักเกอร์โหมดข้อความของ GNU ทำงานในคอนโซล
+ Comment[tr]=GNU'dan konsol için metin tabanlı hata ayıklayıcı
+ Comment[tt]=Konsollı GNU-Betçe
+-Comment[uk]=GNU зневаджувач командного рядка у консолі
++Comment[uk]=GNU зневадник командного рядка у консолі
+ Comment[uz]=Консолда GNU учун матн асосида дебаггер
+ Comment[ven]=Manwalwa o di sendekaho nga dibaga i bvaho GNU kha Khontsolu
+ Comment[vi]=Trình gỡ rối kiểu text của GNU trên konsole
+--- kwin/utils.h	(revision 488815)
++++ kwin/utils.h	(revision 494868)
+@@ -57,8 +57,8 @@
+     DesktopLayer = FirstLayer,
+     BelowLayer,
+     NormalLayer,
++    DockLayer,
+     AboveLayer,
+-    DockLayer,
+     ActiveLayer, // active fullscreen, or active dialog
+     NumLayers // number of layers, must be last
+     };
+--- kwin/tabbox.cpp	(revision 488815)
++++ kwin/tabbox.cpp	(revision 494868)
+@@ -112,7 +112,9 @@
+                 else if( !list.contains( modal ))
+                     list += modal;
+                 else
+-                    ; // nothing
++                    {
++                    // nothing
++                    }
+                 }
+             }
+ 
+--- kwin/tools/decobenchmark/preview.cpp	(revision 488815)
++++ kwin/tools/decobenchmark/preview.cpp	(revision 494868)
+@@ -14,7 +14,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #include "preview.h"
+--- kwin/tools/decobenchmark/main.cpp	(revision 488815)
++++ kwin/tools/decobenchmark/main.cpp	(revision 494868)
+@@ -15,7 +15,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #include <qtimer.h>
+--- kwin/tools/decobenchmark/preview.h	(revision 488815)
++++ kwin/tools/decobenchmark/preview.h	(revision 494868)
+@@ -14,7 +14,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #ifndef KWINDECORATION_PREVIEW_H
+--- kwin/tools/decobenchmark/main.h	(revision 488815)
++++ kwin/tools/decobenchmark/main.h	(revision 494868)
+@@ -15,7 +15,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #ifndef BENCH_MAIN_H
+--- kwin/clients/laptop/laptopclient.cpp	(revision 488815)
++++ kwin/clients/laptop/laptopclient.cpp	(revision 494868)
+@@ -459,6 +459,13 @@
+     KCommonDecoration::init();
+ }
+ 
++void LaptopClient::captionChange()
++{
++    bufferDirty = true;
++
++    KCommonDecoration::captionChange();
++}
++
+ void LaptopClient::paintEvent( QPaintEvent* )
+ {
+     QPainter p(widget());
+--- kwin/clients/laptop/laptopclient.h	(revision 488815)
++++ kwin/clients/laptop/laptopclient.h	(revision 494868)
+@@ -48,6 +48,7 @@
+     void paintEvent( QPaintEvent* );
+     void reset( unsigned long );
+     void updateActiveBuffer();
++    void captionChange();
+ private:
+     bool mustDrawHandle() const;
+     bool isTransient() const;
+--- kwin/clients/laptop/laptop.desktop	(revision 488815)
++++ kwin/clients/laptop/laptop.desktop	(revision 494868)
+@@ -56,7 +56,7 @@
+ Name[ven]=Khomupwutha pfarwa
+ Name[wa]=Poirtåve
+ Name[xh]=Umphezulu osongiweyo
+-Name[zh_CN]=膝上计算机
++Name[zh_CN]=笔记本电脑
+ Name[zh_TW]=膝上型的電腦
+ Name[zu]=Ikhomputha ephathwayo eyisicaba
+ X-KDE-Library=kwin3_laptop
+--- kwin/clients/keramik/keramik.cpp	(revision 488815)
++++ kwin/clients/keramik/keramik.cpp	(revision 494868)
+@@ -1661,6 +1661,12 @@
+ 		titlebarDblClickOperation();
+ }
+ 
++void KeramikClient::wheelEvent( QWheelEvent *e )
++{
++	if (isSetShade() 
++            || QRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) )
++		titlebarMouseWheelOperation( e->delta());
++}
+ 
+ KeramikClient::Position KeramikClient::mousePosition( const QPoint &p ) const
+ {
+@@ -1797,6 +1803,10 @@
+ 			processMousePressEvent( static_cast< QMouseEvent* >( e ) );
+ 			return true;
+ 
++		case QEvent::Wheel:
++			wheelEvent( static_cast< QWheelEvent* >( e ));
++			return true;
++
+ 		default:
+ 	    		return false;
+ 	}
+--- kwin/clients/keramik/keramik.h	(revision 488815)
++++ kwin/clients/keramik/keramik.h	(revision 494868)
+@@ -165,6 +165,7 @@
+ 			void resizeEvent( QResizeEvent *); // FRAME
+ 			void paintEvent( QPaintEvent *); // FRAME
+ 			void mouseDoubleClickEvent( QMouseEvent * ); // FRAME
++			void wheelEvent( QWheelEvent *); //FRAME
+ 			int width() const { return widget()->width(); }
+ 			int height() const { return widget()->height(); }
+ 
+--- kwin/kcmkwin/kwindecoration/buttons.cpp	(revision 488815)
++++ kwin/kcmkwin/kwindecoration/buttons.cpp	(revision 494868)
+@@ -24,7 +24,7 @@
+   
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ */
+ 
+--- kwin/kcmkwin/kwindecoration/kwindecoration.cpp	(revision 488815)
++++ kwin/kcmkwin/kwindecoration/kwindecoration.cpp	(revision 494868)
+@@ -23,7 +23,7 @@
+ 
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ */
+ 
+--- kwin/kcmkwin/kwindecoration/preview.cpp	(revision 488815)
++++ kwin/kcmkwin/kwindecoration/preview.cpp	(revision 494868)
+@@ -14,7 +14,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #include "preview.h"
+--- kwin/kcmkwin/kwindecoration/buttons.h	(revision 488815)
++++ kwin/kcmkwin/kwindecoration/buttons.h	(revision 494868)
+@@ -24,7 +24,7 @@
+   
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ */
+ 
+--- kwin/kcmkwin/kwindecoration/kwindecoration.h	(revision 488815)
++++ kwin/kcmkwin/kwindecoration/kwindecoration.h	(revision 494868)
+@@ -23,7 +23,7 @@
+   
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ */
+ 
+--- kwin/kcmkwin/kwindecoration/pixmaps.h	(revision 488815)
++++ kwin/kcmkwin/kwindecoration/pixmaps.h	(revision 494868)
+@@ -24,7 +24,7 @@
+   
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ */
+ 
+--- kwin/kcmkwin/kwindecoration/preview.h	(revision 488815)
++++ kwin/kcmkwin/kwindecoration/preview.h	(revision 494868)
+@@ -14,7 +14,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #ifndef KWINDECORATION_PREVIEW_H
+--- kwin/kcmkwin/kwindecoration/kwindecoration.desktop	(revision 488815)
++++ kwin/kcmkwin/kwindecoration/kwindecoration.desktop	(revision 494868)
+@@ -99,7 +99,7 @@
+ Comment[fa]=تنظیم نما و حس عنوان پنجره
+ Comment[fi]=Muokkaa ikkunoiden kehysten ulkonäköä
+ Comment[fr]=Configuration de l'apparence du titre des fenêtres
+-Comment[fy]=Hjir kinst it uterlik en gedrach fan finstertitels ynstelle
++Comment[fy]=Hjir kinne jo it uterlik en gedrach fan finstertitels ynstelle
+ Comment[gl]=Configurar a aparéncia dos títulos das fiestras
+ Comment[he]=שינוי הגדרות המראה והתחושה של כותרות חלונות
+ Comment[hi]=विंडो शीर्षकों के रूप आकार को कॉन्फ़िगर करें
+--- kwin/kcmkwin/kwindecoration/kwindecorationIface.h	(revision 488815)
++++ kwin/kcmkwin/kwindecoration/kwindecorationIface.h	(revision 494868)
+@@ -23,7 +23,7 @@
+   
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ */
+ 
+--- kwin/kcmkwin/kwinrules/ruleswidget.cpp	(revision 488815)
++++ kwin/kcmkwin/kwinrules/ruleswidget.cpp	(revision 494868)
+@@ -13,7 +13,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #include "ruleswidget.h"
+--- kwin/kcmkwin/kwinrules/ruleswidget.h	(revision 488815)
++++ kwin/kcmkwin/kwinrules/ruleswidget.h	(revision 494868)
+@@ -13,7 +13,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ 
+--- kwin/kcmkwin/kwinrules/kwinrules.desktop	(revision 488815)
++++ kwin/kcmkwin/kwinrules/kwinrules.desktop	(revision 494868)
+@@ -78,7 +78,7 @@
+ Comment[eu]=Konfiguratu leiho jakin baten ezarpenak
+ Comment[fi]=Muokkaa ikkunakohtaisia asetuksia
+ Comment[fr]=Configuration de paramètres spécifiques à une fenêtre
+-Comment[fy]=HJir kinne jo ynstellings kieze spesifyk foar ien finster
++Comment[fy]=Hjir kinne jo ynstellings kieze spesifyk foar ien finster
+ Comment[gl]=Configurazón das opzóns específicas para unha fiestra
+ Comment[he]=קבע הגדרות לחלון מסוים
+ Comment[hi]=किसी खास विंडो के लिए विन्यास कॉन्फ़िगर करें
+--- kwin/kcmkwin/kwinrules/kcm.cpp	(revision 488815)
++++ kwin/kcmkwin/kwinrules/kcm.cpp	(revision 494868)
+@@ -13,7 +13,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #include "kcm.h"
+--- kwin/kcmkwin/kwinrules/detectwidget.cpp	(revision 488815)
++++ kwin/kcmkwin/kwinrules/detectwidget.cpp	(revision 494868)
+@@ -13,7 +13,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #include "detectwidget.h"
+--- kwin/kcmkwin/kwinrules/kcm.h	(revision 488815)
++++ kwin/kcmkwin/kwinrules/kcm.h	(revision 494868)
+@@ -13,7 +13,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ 
+--- kwin/kcmkwin/kwinrules/detectwidget.h	(revision 488815)
++++ kwin/kcmkwin/kwinrules/detectwidget.h	(revision 494868)
+@@ -13,7 +13,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ 
+--- kwin/kcmkwin/kwinrules/main.cpp	(revision 488815)
++++ kwin/kcmkwin/kwinrules/main.cpp	(revision 494868)
+@@ -13,7 +13,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #include <kcmdlineargs.h>
+--- kwin/kcmkwin/kwinrules/ruleslist.cpp	(revision 488815)
++++ kwin/kcmkwin/kwinrules/ruleslist.cpp	(revision 494868)
+@@ -13,7 +13,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #include "ruleslist.h"
+--- kwin/kcmkwin/kwinrules/ruleslist.h	(revision 488815)
++++ kwin/kcmkwin/kwinrules/ruleslist.h	(revision 494868)
+@@ -13,7 +13,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ 
+--- kwin/kcmkwin/kwinoptions/kwinfocus.desktop	(revision 488815)
++++ kwin/kcmkwin/kwinoptions/kwinfocus.desktop	(revision 494868)
+@@ -153,7 +153,7 @@
+ Keywords[eu]=fokua,kokapena,auto aurrera ekarri,aurrera ekarri,click raise,teklatua,CDE,alt-tab,mahaigain guztiak
+ Keywords[fi]=fokus,sijoitus,automaattinosto,napsautusnosto,näppäimistö,CDE
+ Keywords[fr]=focus,placement,auto élévation,élévation,clic clavier,CDE,alt-tab,tous les bureaux
+-Keywords[fy]=focus,fokus,finster,aandacht,oandacht,plaatsing,pleatsing,voorgrond,foargrûn,achtergrond,eftergrûn,klikken,toetsenbord,kaauboerd,CDE,alt-tab,alle bureaubladen,alle buroblêden
++Keywords[fy]=focus,fokus,finster,aandacht,oandacht,plaatsing,pleatsing,voorgrond,foargrûn,achtergrond,eftergrûn,klikken,toetsenbord,toetseboerd,CDE,alt-tab,alle bureaubladen,alle buroblêden
+ Keywords[ga]=fócas,láithriú,uathardaigh,ardaigh,gliogardaigh,méarchlár,CDE,alt-tab,gach deasc
+ Keywords[gl]=foco,emprazamento,auto subir,subir,premer para subir,teclado,CDE,alt-tab,todo o escritório
+ Keywords[he]=התמקדות,מיקום,הבאה אוטומטית לחזית,הבאה לחזית,לחיצה להבאה לחזית,מקלדת,כל שולחנות העבודה, focus,placement,auto raise,raise, click raise,keyboard,CDE,alt-tab,all desktop
+--- kwin/kcmkwin/kwinoptions/kwinmoving.desktop	(revision 488815)
++++ kwin/kcmkwin/kwinoptions/kwinmoving.desktop	(revision 494868)
+@@ -98,7 +98,7 @@
+ Comment[fa]=تنظیم نوع حرکت پنجره‌ها
+ Comment[fi]=Ikkunoiden siirtäminen
+ Comment[fr]=Configuration de la manière dont les fenêtres sont déplacées
+-Comment[fy]=Hjir kinst de wize wêrop finsters sich ferpleatse ynstelle
++Comment[fy]=Hjir kinne jo de wize wêrop finsters har ferpleatse ynstelle
+ Comment[ga]=Cumraigh conas a aistrítear fuinneoga
+ Comment[gl]=Aqui pode configurar o xeito en que se moven as fiestras
+ Comment[he]=שינוי הדרך שבה חלונות מוזזים
+--- kwin/kcmkwin/kwinoptions/windows.h	(revision 488815)
++++ kwin/kcmkwin/kwinoptions/windows.h	(revision 494868)
+@@ -16,7 +16,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #ifndef __KWINDOWCONFIG_H__
+--- kwin/kcmkwin/kwinoptions/kwinactions.desktop	(revision 488815)
++++ kwin/kcmkwin/kwinoptions/kwinactions.desktop	(revision 494868)
+@@ -103,7 +103,7 @@
+ Comment[fa]=تنظیمات صفحه کلید و موش
+ Comment[fi]=Muokkaa näppäimistön ja hiiren asetuksia
+ Comment[fr]=Configuration des réglages du clavier et de la souris
+-Comment[fy]=Hjir kinst de ynstellings fan kaaiboerd en mûs ynstelle
++Comment[fy]=Hjir kinne jo de ynstellings fan toetseboerd en mûs ynstelle
+ Comment[ga]=Cumraigh socruithe an mhéarchláir agus na luiche
+ Comment[gl]=Configurar as opzóns do teclado e o rato
+ Comment[he]=שינוי הגדרות המקלדת והעכבר
+--- kwin/kcmkwin/kwinoptions/main.cpp	(revision 488815)
++++ kwin/kcmkwin/kwinoptions/main.cpp	(revision 494868)
+@@ -14,7 +14,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #include <qlayout.h>
+--- kwin/kcmkwin/kwinoptions/kwinadvanced.desktop	(revision 488815)
++++ kwin/kcmkwin/kwinoptions/kwinadvanced.desktop	(revision 494868)
+@@ -102,7 +102,7 @@
+ Comment[fa]=تنظیم مدیریت پیشرفته‌ی پنجره‌ها
+ Comment[fi]=Muokkaa ikkunoinnin ominaisuuksien lisäasetuksia
+ Comment[fr]=Configuration des fonctionnalités de gestion avancée des fenêtres
+-Comment[fy]=Hjir kinst de avansearre finsterbehearmooglikheden ynstellen
++Comment[fy]=Hjir kinne jo de avansearre finsterbehearmooglikheden ynstelle
+ Comment[gl]=Configurar as características avanzadas da xestión de fiestras
+ Comment[he]=שינוי הגדרות מתקדמות של ניהול חלונות
+ Comment[hi]=विस्तृत विंडो प्रबंधन विशेषता कॉन्फ़िगर करें
+--- kwin/kcmkwin/kwinoptions/mouse.cpp	(revision 488815)
++++ kwin/kcmkwin/kwinoptions/mouse.cpp	(revision 494868)
+@@ -14,7 +14,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #include <qlabel.h>
+--- kwin/kcmkwin/kwinoptions/main.h	(revision 488815)
++++ kwin/kcmkwin/kwinoptions/main.h	(revision 494868)
+@@ -18,7 +18,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ 
+--- kwin/kcmkwin/kwinoptions/kwintranslucency.desktop	(revision 488815)
++++ kwin/kcmkwin/kwinoptions/kwintranslucency.desktop	(revision 494868)
+@@ -23,7 +23,7 @@
+ Name[eu]=Gardentasuna
+ Name[fi]=Läpikuultavuus
+ Name[fr]=Transparence
+-Name[fy]=Trochsichtighyd
++Name[fy]=Trochsichtichheid
+ Name[ga]=Tréshoilseacht
+ Name[gl]=Translucéncia
+ Name[he]=שקיפות
+@@ -118,7 +118,7 @@
+ Keywords[eu]=gardena,gardentasunak,itzalak
+ Keywords[fi]=läpikuultavuus, läpinäkyvyys, varjot
+ Keywords[fr]=translucidité,translucide,transparence,transparent,ombre
+-Keywords[fy]=translucency, trochsichtich,ransparantie,schaduwen,skaden
++Keywords[fy]=translucency,trochsichtich,ransparantie,schaduwen,skaden
+ Keywords[ga]=tréshoilseacht,gléine,scáthanna
+ Keywords[gl]=translucéncia,transparéncia,sombras
+ Keywords[hu]=áttetszőség,áttetsző,árnyékok
+--- kwin/kcmkwin/kwinoptions/windows.cpp	(revision 488815)
++++ kwin/kcmkwin/kwinoptions/windows.cpp	(revision 494868)
+@@ -16,7 +16,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  *
+  *
+  */
+--- kwin/kcmkwin/kwinoptions/mouse.h	(revision 488815)
++++ kwin/kcmkwin/kwinoptions/mouse.h	(revision 494868)
+@@ -16,7 +16,7 @@
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
+ #ifndef __KKWMMOUSECONFIG_H__
+--- kwin/data/update_window_settings.cpp	(revision 488815)
++++ kwin/data/update_window_settings.cpp	(revision 494868)
+@@ -117,7 +117,7 @@
+             cfg.writeEntry( "windowrolematch", 1 );
+             }
+         if( info->windowType == static_cast< NET::WindowType >( -2 )) // undefined
+-            ; // all types
++            {} // all types
+         if( info->windowType == NET::Unknown )
+             cfg.writeEntry( "types", NET::NormalMask );
+         else
+--- kwin/options.cpp	(revision 488815)
++++ kwin/options.cpp	(revision 494868)
+@@ -151,7 +151,7 @@
+         (*it) = (*it).lower();
+ 
+     killPingTimeout = config->readNumEntry( "KillPingTimeout", 5000 );
+-    hideUtilityWindowsForInactive = config->readBoolEntry( "HideUtilityWindowsForInactive", false );
++    hideUtilityWindowsForInactive = config->readBoolEntry( "HideUtilityWindowsForInactive", true );
+ 
+     // Mouse bindings
+     config->setGroup( "MouseBindings");
+--- kwin/layers.cpp	(revision 488815)
++++ kwin/layers.cpp	(revision 494868)
+@@ -29,7 +29,7 @@
+  the clients were created.
+ 
+  Every window has one layer assigned in which it is. There are 6 layers,
+- from bottom : DesktopLayer, BelowLayer, NormalLayer, AboveLayer, DockLayer
++ from bottom : DesktopLayer, BelowLayer, NormalLayer, DockLayer, AboveLayer
+  and ActiveLayer (see also NETWM sect.7.10.). The layer a window is in depends
+  on the window type, and on other things like whether the window is active.
+ 
+--- kwin/eventsrc	(revision 488815)
++++ kwin/eventsrc	(revision 494868)
+@@ -2653,7 +2653,7 @@
+ Name[fa]=حذف پنجره
+ Name[fi]=Lopeta ikkuna
+ Name[fr]=Supprimer la fenêtre
+-Name[fy]=Finster wisse
++Name[fy]=Finster wiskje
+ Name[ga]=Scrios Fuinneog
+ Name[gl]=Borrar Fiestra
+ Name[he]=מחיקת חלון
+@@ -2725,7 +2725,7 @@
+ Comment[eu]=Ezabatu leihoa
+ Comment[fi]=Lopeta ikkuna
+ Comment[fr]=Supprimer une fenêtre
+-Comment[fy]=Finster wisse
++Comment[fy]=Finster wiskje
+ Comment[ga]=Scrios Fuinneog
+ Comment[gl]=Borrar fiestra
+ Comment[he]=חלון נמחק
+@@ -4022,7 +4022,7 @@
+ Comment[eu]=Leiho elkarrizketa agertzen da
+ Comment[fi]=Lyhytaikainen ikkuna (dialogi) ilmestyy
+ Comment[fr]=Une boîte de dialogue apparaît
+-Comment[fy]=In dialooch ferskynd
++Comment[fy]=In dialooch ferskynt
+ Comment[gl]=Aparece unha fiestra temporal (un diálogo)
+ Comment[he]=מופיע חלון ארעי (דו־שיח)
+ Comment[hi]=ट्रांजिएंट विंडो (एक संवाद) प्रकट हुआ
+@@ -4084,7 +4084,7 @@
+ Name[et]=Dialoogi kustutamine
+ Name[eu]=Ezabatu elkarrizketa
+ Name[fa]=حذف گفتگو
+-Name[fi]=Tuhoa ikkuna
++Name[fi]=Lopeta ikkuna
+ Name[fr]=Fermeture de la boîte de dialogue
+ Name[fy]=Dialooch wisse
+ Name[ga]=Scrios Dialóg
+@@ -4608,7 +4608,7 @@
+ Name[fa]=تغییر اندازه‌ی پنجره تمام شد
+ Name[fi]=Ikkunan koonmuutos loppuu
+ Name[fr]=Fin de redimensionnement de fenêtre
+-Name[fy]=Stopje mei finster fan grutte wizigjen
++Name[fy]=Finster fan grutte wizigjen einigje
+ Name[gl]=Remate dun Redimensionamento de Fiestra
+ Name[he]=סיום שינוי גודל חלון
+ Name[hi]=विंडो नया-आकार बन्द
+@@ -4675,7 +4675,7 @@
+ Comment[eu]=Leihoaren tamaina aldaketa bukatu da
+ Comment[fi]=Ikkunan koonmuutos loppuu
+ Comment[fr]=Fin de redimensionnement de fenêtre
+-Comment[fy]=In finster is klaar mei it wizigjen fan grutte
++Comment[fy]=In finster is ree mei it wizigjen fan grutte
+ Comment[gl]=Unha Fiestra Rematou o Redimensionamento
+ Comment[he]=חלון השלים את שינוי גודלו
+ Comment[hi]=एक विंडो ने नया-आकार पूर्ण किया
+--- kwin/geometry.cpp	(revision 488815)
++++ kwin/geometry.cpp	(revision 494868)
+@@ -2072,9 +2072,7 @@
+         setGeometry( workspace()->clientArea( FullScreenArea, this ));
+     else
+         {
+-        if( maximizeMode() != MaximizeRestore )
+-            changeMaximize( false, false, true ); // adjust size
+-        else if( !geom_fs_restore.isNull())
++        if( !geom_fs_restore.isNull())
+             setGeometry( QRect( geom_fs_restore.topLeft(), adjustedSize( geom_fs_restore.size())));
+         // TODO isShaded() ?
+         else
+--- konsole/kwrited.desktop	(revision 488815)
++++ konsole/kwrited.desktop	(revision 494868)
+@@ -77,7 +77,7 @@
+ Comment[eu]=Begiratu write(1) edo wall(1)-ekin bidalitako erabiltzaile lokalen mezuak
+ Comment[fi]=Seuraa viestejä, joita paikalliset käyttäjät lähettävät write(1) tai wall(1) -komennoilla
+ Comment[fr]=Afficher les messages écrits par les autres utilisateurs locaux à l'aide de la commande « write(1) » ou « wall(1) »
+-Comment[fy]=Observearje berjochten fan lokale brûkers ferstjoerd mei write(1) of wall(1)
++Comment[fy]=Berjochten fan lokale brûkers ferstjoerd mei write(1) of wall(1) observearje
+ Comment[gl]=Buscar mensaxes de usuários locais enviadas con write(1) ou wall(1)
+ Comment[he]=תפוס הודעות הנשלחות על ידי משתמשים מקומיים, שנשלחו על ידי write(1) או wall(1)
+ Comment[hi]=स्थानीय उपयोक्ताओं द्वारा राइट(1) या वाल(1) के जरिए भेजे गए संदेशों के लिए देखें
+--- konsole/other/sumc.desktop	(revision 488815)
++++ konsole/other/sumc.desktop	(revision 494868)
+@@ -74,7 +74,7 @@
+ Comment[fa]=فرمان‌دار نیمه‌شب ریشه جدید
+ Comment[fi]=Uusi pääkäyttäjän Midnight Commander -istunto
+ Comment[fr]=Nouveau Midnight Commander en tant que superutilisateur
+-Comment[fy]=Nije root Midnight Kommander
++Comment[fy]=Nije Root Midnight Kommander
+ Comment[gl]=Novo Midnight Commander como Root
+ Comment[he]=משימת Root Midnight Commander חדשה
+ Comment[hi]=नया रूट मिडनाइट कमांडर
+--- konsole/other/screen.desktop	(revision 488815)
++++ konsole/other/screen.desktop	(revision 494868)
+@@ -87,7 +87,7 @@
+ Comment[fa]=نشست صفحه‌ی جدید
+ Comment[fi]=Uusi Screen-istunto
+ Comment[fr]=Nouvelle session Screen
+-Comment[fy]=nije Skerm-sesje
++Comment[fy]=Nije Skerm-sesje
+ Comment[gl]=Nova Sesión de Pantalla
+ Comment[he]=מנהל מסכים חדש
+ Comment[hr]=Novi zaslon seanse
+--- l10n/ba/entry.desktop	(revision 488815)
++++ l10n/ba/entry.desktop	(revision 494868)
+@@ -28,7 +28,7 @@
+ Name[hi]=बोस्निया और हर्जेगोविना
+ Name[hr]=Bosna i Hercegovina
+ Name[hu]=Bosznia-Hercegovina
+-Name[is]=Bosnía og Herzegónía
++Name[is]=Bosnía og Hersegóvína
+ Name[it]=Bosnia e Erzegovina
+ Name[ja]=ボスニアヘルツェゴビナ
+ Name[km]=បូស្ន៊ី និង​ហឺហ្ស៊េហ្គោវីណា
+--- l10n/northamerica.desktop	(revision 488815)
++++ l10n/northamerica.desktop	(revision 494868)
+@@ -30,7 +30,7 @@
+ Name[hr]=Amerika, Sjeverna
+ Name[hu]=Észak-Amerika
+ Name[id]=Amerika, Utara
+-Name[is]=Ameríka, Norður
++Name[is]=Ameríka, Norður-Ameríka
+ Name[it]=America settentrionale
+ Name[ja]=北アメリカ
+ Name[km]=អាមេរិក​ខាង​ជើង
+--- l10n/bd/entry.desktop	(revision 488815)
++++ l10n/bd/entry.desktop	(revision 494868)
+@@ -17,6 +17,7 @@
+ Name[hi]=बांग्लादेश
+ Name[hr]=Bangladeš
+ Name[hu]=Banglades
++Name[is]=Bangladess
+ Name[ja]=バングラデシュ
+ Name[km]=បង់ក្លាដេស្ហ
+ Name[ko]=방글라데시
+--- l10n/bf/entry.desktop	(revision 488815)
++++ l10n/bf/entry.desktop	(revision 494868)
+@@ -12,6 +12,7 @@
+ Name[he]=בורניקה פאסו
+ Name[hi]=बुर्किना फासो
+ Name[hr]=Burkina faso
++Name[is]=Búrkína Fasó
+ Name[ja]=ブルキナファソ
+ Name[km]=ប៊ូរគីណាហ្វាសូ
+ Name[ko]=부르키나 파소
+--- l10n/bh/entry.desktop	(revision 488815)
++++ l10n/bh/entry.desktop	(revision 494868)
+@@ -17,6 +17,7 @@
+ Name[gl]=Barein
+ Name[he]=בחריין
+ Name[hi]=बहारीन
++Name[is]=Barein
+ Name[ja]=バーレーン
+ Name[km]=បារ៉ែន
+ Name[ko]=바레인
+--- l10n/bi/entry.desktop	(revision 488815)
++++ l10n/bi/entry.desktop	(revision 494868)
+@@ -11,6 +11,7 @@
+ Name[ga]=An Bhurúin
+ Name[he]=בורונדי
+ Name[hi]=बुरूंडी
++Name[is]=Búrúndí
+ Name[ja]=ブルンジ
+ Name[km]=ប៊ូរុនឌី
+ Name[ko]=부룬디
+--- l10n/southeurope.desktop	(revision 488815)
++++ l10n/southeurope.desktop	(revision 494868)
+@@ -30,7 +30,7 @@
+ Name[hr]=Europa, Južna
+ Name[hu]=Dél-Európa
+ Name[id]=Eropa Selatan
+-Name[is]=Evrópa, Suður
++Name[is]=Evrópa, Suður-Evrópa
+ Name[it]=Europa meridionale
+ Name[ja]=南ヨーロッパ
+ Name[km]=អឺរ៉ុប​ខាង​ត្បូង
+--- l10n/bj/entry.desktop	(revision 488815)
++++ l10n/bj/entry.desktop	(revision 494868)
+@@ -12,6 +12,7 @@
+ Name[ga]=Beinin
+ Name[he]=בנין
+ Name[hi]=बेनिन
++Name[is]=Benín
+ Name[ja]=ベナン
+ Name[km]=បេណាំង
+ Name[ko]=베냉
+--- l10n/yu/entry.desktop	(revision 488815)
++++ l10n/yu/entry.desktop	(revision 494868)
+@@ -16,7 +16,7 @@
+ Name[fy]=Servië en Montenegro
+ Name[gl]=Sérbia e Montenegro
+ Name[hu]=Szerbia és Montenegró
+-Name[is]=Serbía og Montenegro
++Name[is]=Serbía og Svartfjallaland
+ Name[it]=Serbia e Montenegro
+ Name[ja]=セルビアモンテネグロ
+ Name[km]=សែប៊ី និង ម៉ុងតេណេហ្ក្រូ
+--- l10n/bm/entry.desktop	(revision 488815)
++++ l10n/bm/entry.desktop	(revision 494868)
+@@ -15,6 +15,7 @@
+ Name[ga]=Beirmiúda
+ Name[he]=ברמודה
+ Name[hi]=बरमूडा
++Name[is]=Bermúdaeyjar
+ Name[ja]=英領バーミューダ
+ Name[km]=ប៊េរមូដា
+ Name[ko]=버뮤다
+--- l10n/bn/entry.desktop	(revision 488815)
++++ l10n/bn/entry.desktop	(revision 494868)
+@@ -18,6 +18,7 @@
+ Name[he]=בורניי דרוסלם
+ Name[hi]=ब्रूनेई दारेस्सलाम
+ Name[hu]=Brunei Szultánság
++Name[is]=Brúnei Darussalam
+ Name[it]=Brunei
+ Name[ja]=ブルネイ
+ Name[km]=ប្រ៊ុយណេ
+--- l10n/bs/entry.desktop	(revision 488815)
++++ l10n/bs/entry.desktop	(revision 494868)
+@@ -18,6 +18,7 @@
+ Name[he]=בהמס
+ Name[hi]=बहामा
+ Name[hu]=Bahamák
++Name[is]=Bahamaeyjar
+ Name[ja]=バハマ
+ Name[km]=បាហាម៉ា
+ Name[ko]=바하마
+--- l10n/bt/entry.desktop	(revision 488815)
++++ l10n/bt/entry.desktop	(revision 494868)
+@@ -19,6 +19,7 @@
+ Name[he]=בהוטן
+ Name[hi]=भूटान
+ Name[hu]=Bhután
++Name[is]=Bútan
+ Name[ja]=ブータン
+ Name[km]=ប៊ូតាន
+ Name[ko]=부탄
+--- l10n/jm/entry.desktop	(revision 488815)
++++ l10n/jm/entry.desktop	(revision 494868)
+@@ -23,6 +23,7 @@
+ Name[hr]=Jamajka
+ Name[hu]=Jamaika
+ Name[id]=Jamaika
++Name[is]=Jamaíka
+ Name[it]=Giamaica
+ Name[ja]=ジャマイカ
+ Name[km]=ហ្សាម៉ាអ៊ិគ
+--- l10n/bw/entry.desktop	(revision 488815)
++++ l10n/bw/entry.desktop	(revision 494868)
+@@ -13,6 +13,7 @@
+ Name[he]=בוצאונה
+ Name[hi]=बोत्सवाना
+ Name[hr]=Botsvana
++Name[is]=Botsvana
+ Name[ja]=ボツワナ
+ Name[km]=បុតស្វាណា
+ Name[ko]=보츠와나
+--- l10n/by/entry.desktop	(revision 488815)
++++ l10n/by/entry.desktop	(revision 494868)
+@@ -26,6 +26,7 @@
+ Name[hi]=बेलारूस
+ Name[hr]=Bjelorusija
+ Name[hu]=Fehéroroszország
++Name[is]=Hvíta-Rússland
+ Name[it]=Bielorussia
+ Name[ja]=ベラルーシ
+ Name[km]=បេឡារុស្ស
+--- l10n/za/entry.desktop	(revision 488815)
++++ l10n/za/entry.desktop	(revision 494868)
+@@ -31,7 +31,7 @@
+ Name[hr]=Južna Afrika
+ Name[hu]=Dél-Afrika
+ Name[id]=Afrika Selatan
+-Name[is]=Suður Afríka
++Name[is]=Suður-Afríka
+ Name[it]=Sud Africa
+ Name[ja]=南アフリカ
+ Name[km]=អាហ្វ្រិក​ខាង​ត្បូង
+--- l10n/bz/entry.desktop	(revision 488815)
++++ l10n/bz/entry.desktop	(revision 494868)
+@@ -12,6 +12,7 @@
+ Name[ga]=An Bheilís
+ Name[he]=בליז
+ Name[hi]=बेलिज
++Name[is]=Belís
+ Name[ja]=ベリーズ
+ Name[km]=បេលីហ្ស
+ Name[ko]=벨리즈
+--- l10n/cc/entry.desktop	(revision 488815)
++++ l10n/cc/entry.desktop	(revision 494868)
+@@ -24,7 +24,7 @@
+ Name[hi]=कोकोस (कीलिंग) आइलैंड्स
+ Name[hr]=Cocos (Keeling) Otoci
+ Name[hu]=Kókusz-szigetek (Keeling)
+-Name[is]=Cocos (Keeling) eyjar
++Name[is]=Kókoseyjar
+ Name[it]=Isole Cocos (Keeling)
+ Name[ja]=オーストラリア領ココス島
+ Name[km]=កោះ Cocos (Keeling)
+--- l10n/cd/entry.desktop	(revision 488815)
++++ l10n/cd/entry.desktop	(revision 494868)
+@@ -23,7 +23,7 @@
+ Name[he]=קונגו, הרפובליקה הדמוקרטית של
+ Name[hi]=डेमोक्रेटिक रिपब्लिक ऑफ कॉगो
+ Name[hu]=Kongói Demokratikus Köztársaság
+-Name[is]=Congo, lýðveldið
++Name[is]=Kongó, Austur
+ Name[it]=Congo, Repubblica Democratica del
+ Name[ja]=コンゴ,民主共和国
+ Name[km]=សាធារណរដ្ឋ​ប្រជាធិបតេយ្យ​កុងហ្គោ
+--- l10n/zm/entry.desktop	(revision 488815)
++++ l10n/zm/entry.desktop	(revision 494868)
+@@ -22,7 +22,7 @@
+ Name[he]=זמביה
+ Name[hi]=ज़ाम्बिया
+ Name[hr]=Zambija
+-Name[is]=Zambía
++Name[is]=Sambía
+ Name[ja]=ザンビア
+ Name[km]=ហ្សាំប៊ី
+ Name[ko]=잠비아
+--- l10n/cf/entry.desktop	(revision 488815)
++++ l10n/cf/entry.desktop	(revision 494868)
+@@ -27,6 +27,7 @@
+ Name[hi]=सेंट्रल अफ्रीकन रिपब्लिक
+ Name[hr]=Centralna Afrička Republika
+ Name[hu]=Közép-Afrikai Köztársaság
++Name[is]=Mið-Afríkulýðveldið
+ Name[it]=Repubblica Centrafricana
+ Name[ja]=中央アフリカ共和国
+ Name[km]=សាធារណរដ្ឋ​អាហ្វ្រិក​កណ្ដាល
+--- l10n/rw/entry.desktop	(revision 488815)
++++ l10n/rw/entry.desktop	(revision 494868)
+@@ -19,6 +19,7 @@
+ Name[hi]=रवांडा
+ Name[hr]=Ruanda
+ Name[hu]=Ruanda
++Name[is]=Rúanda
+ Name[it]=Ruanda
+ Name[ja]=ルワンダ
+ Name[km]=រវ៉ាន់ដា
+--- l10n/cg/entry.desktop	(revision 488815)
++++ l10n/cg/entry.desktop	(revision 494868)
+@@ -21,7 +21,7 @@
+ Name[hi]=कोंगो
+ Name[hr]=Kongo
+ Name[hu]=Kongó
+-Name[is]=Kongó
++Name[is]=Kongó, Vestur
+ Name[ja]=コンゴ
+ Name[km]=កុងហ្គោ
+ Name[ko]=콩고
+--- l10n/ci/entry.desktop	(revision 488815)
++++ l10n/ci/entry.desktop	(revision 494868)
+@@ -21,6 +21,7 @@
+ Name[hi]=कोट डि'वॉरे
+ Name[hr]=Baci kocke
+ Name[hu]=Elefántcsontpart
++Name[is]=Fílabeinsströndin
+ Name[it]=Costa d'Avorio
+ Name[ja]=コートジボアール
+ Name[km]=កូដឌីវ័រ
+--- l10n/ck/entry.desktop	(revision 488815)
++++ l10n/ck/entry.desktop	(revision 494868)
+@@ -26,6 +26,7 @@
+ Name[hi]=कुक आइलैंड
+ Name[hr]=Cook otoci
+ Name[hu]=Cook-szigetek
++Name[is]=Cooks-eyjar
+ Name[it]=Isole Cook
+ Name[ja]=ニュージーランド自治領クック諸島
+ Name[km]=កោះ Cook
+--- l10n/cm/entry.desktop	(revision 488815)
++++ l10n/cm/entry.desktop	(revision 494868)
+@@ -27,6 +27,7 @@
+ Name[hi]=कैमरून
+ Name[hr]=Kamerun
+ Name[hu]=Kamerun
++Name[is]=Kamerún
+ Name[it]=Camerun
+ Name[ja]=カメルーン
+ Name[km]=កាមេរូន
+--- l10n/zw/entry.desktop	(revision 488815)
++++ l10n/zw/entry.desktop	(revision 494868)
+@@ -16,6 +16,7 @@
+ Name[he]=זימבבווה
+ Name[hi]=जिम्बाबवे
+ Name[hr]=Zimbabve
++Name[is]=Simbabve
+ Name[ja]=ジンバブエ
+ Name[km]=ហ្ស៊ីមបាបវ៉េ
+ Name[ko]=짐바브웨
+--- l10n/kg/entry.desktop	(revision 488815)
++++ l10n/kg/entry.desktop	(revision 494868)
+@@ -22,6 +22,7 @@
+ Name[he]=קירגיסטן
+ Name[hi]=किर्गिजिस्तान
+ Name[hu]=Kirgizisztán
++Name[is]=Kirgisistan
+ Name[it]=Kirghizistan
+ Name[ja]=キルギスタン
+ Name[km]=គៀរហ្គីស្តង់
+--- l10n/ki/entry.desktop	(revision 488815)
++++ l10n/ki/entry.desktop	(revision 494868)
+@@ -11,6 +11,7 @@
+ Name[ga]=Ciribeas
+ Name[he]=קיריבאטי
+ Name[hi]=किरीबाती
++Name[is]=Kíribatí
+ Name[ja]=キリバス
+ Name[km]=គិរិបាទី
+ Name[ko]=키리바시
+--- l10n/sa/entry.desktop	(revision 488815)
++++ l10n/sa/entry.desktop	(revision 494868)
+@@ -27,6 +27,7 @@
+ Name[hi]=सऊदी अरब
+ Name[hr]=Saudijska Arabija
+ Name[hu]=Szaúd-Arábia
++Name[is]=Sádi-Arabía
+ Name[it]=Arabia Saudita
+ Name[ja]=サウジアラビア
+ Name[km]=អារ៉ាប៊ីសាអ៊ូឌីត
+--- l10n/cr/entry.desktop	(revision 488815)
++++ l10n/cr/entry.desktop	(revision 494868)
+@@ -15,7 +15,7 @@
+ Name[he]=קוסטה ריקה
+ Name[hi]=कोस्टा रिका
+ Name[hr]=Kosta rika
+-Name[is]=Kosta Ríka
++Name[is]=Kostaríka
+ Name[ja]=コスタリカ
+ Name[km]=កូស្តារីកា
+ Name[ko]=코스타 리카
+--- l10n/sb/entry.desktop	(revision 488815)
++++ l10n/sb/entry.desktop	(revision 494868)
+@@ -28,6 +28,7 @@
+ Name[hi]=सोलोमन आइलैंड
+ Name[hr]=Solomonova otočja
+ Name[hu]=Salamon-szigetek
++Name[is]=Salómonseyjar
+ Name[it]=Isole Salomone
+ Name[ja]=ソロモン諸島
+ Name[km]=កោះ​សូឡូម៉ូន
+--- l10n/sc/entry.desktop	(revision 488815)
++++ l10n/sc/entry.desktop	(revision 494868)
+@@ -20,6 +20,7 @@
+ Name[he]=איי סיישל
+ Name[hi]=शेसेल्स
+ Name[hr]=Sejšeli
++Name[is]=Seychelles-eyjar
+ Name[ja]=セイシェル
+ Name[km]=សីស្ហែល
+ Name[ko]=세이셸
+--- l10n/km/entry.desktop	(revision 488815)
++++ l10n/km/entry.desktop	(revision 494868)
+@@ -19,6 +19,7 @@
+ Name[ga]=Na Comóir
+ Name[he]=קומורוס
+ Name[hi]=कोमोरो
++Name[is]=Kómoreyjar
+ Name[it]=Comore
+ Name[ja]=コモロ
+ Name[km]=កុំម៉ូរ៉ូស
+--- l10n/kn/entry.desktop	(revision 488815)
++++ l10n/kn/entry.desktop	(revision 494868)
+@@ -27,6 +27,7 @@
+ Name[hi]=सेंट किट्स तथा नेविस
+ Name[hu]=St. Kitts és Nevis
+ Name[id]=St. Kitts dan Nevis
++Name[is]=Sankti Kristófer og Nevis
+ Name[it]=Saint Kitts e Nevis
+ Name[ja]=セントクリストファーネイビス
+ Name[km]=សង់ឃីត និង នេវីស
+--- l10n/cv/entry.desktop	(revision 488815)
++++ l10n/cv/entry.desktop	(revision 494868)
+@@ -25,6 +25,7 @@
+ Name[he]=כף וורדה
+ Name[hi]=कैप वर्डे
+ Name[hu]=Zöldfoki-szigetek
++Name[is]=Grænhöfðaeyjar
+ Name[it]=Capo Verde
+ Name[ja]=カーポベルデ
+ Name[km]=កាបវែរ
+--- l10n/sg/entry.desktop	(revision 488815)
++++ l10n/sg/entry.desktop	(revision 494868)
+@@ -23,6 +23,7 @@
+ Name[hi]=सिंगापोर
+ Name[hr]=Singapur
+ Name[hu]=Szingapúr
++Name[is]=Singapúr
+ Name[ja]=シンガポール
+ Name[km]=សិង្ហបុរី
+ Name[ko]=싱가포르
+--- l10n/kp/entry.desktop	(revision 488815)
++++ l10n/kp/entry.desktop	(revision 494868)
+@@ -30,7 +30,7 @@
+ Name[hr]=Sjeverna Koreja
+ Name[hu]=Észak-Korea
+ Name[id]=Korea Utara
+-Name[is]=Norður Kórea
++Name[is]=Norður-Kórea
+ Name[it]=Corea del Nord
+ Name[ja]=朝鮮民主主義人民共和国
+ Name[km]=កូរ៉េ​ខាង​ជើង
+--- l10n/cx/entry.desktop	(revision 488815)
++++ l10n/cx/entry.desktop	(revision 494868)
+@@ -26,6 +26,7 @@
+ Name[hi]=क्रिसमस आइलैंड
+ Name[hr]=Uskršnji otoci
+ Name[hu]=Karácsony-szigetek
++Name[is]=Jólaey
+ Name[it]=Isola Christmas
+ Name[ja]=クリスマス諸島
+ Name[km]=កោះ Christmas
+--- l10n/sh/entry.desktop	(revision 488815)
++++ l10n/sh/entry.desktop	(revision 494868)
+@@ -24,6 +24,7 @@
+ Name[hi]=सेंट हेलेना
+ Name[hr]=Sveta Helena
+ Name[hu]=Szent Heléna
++Name[is]=Sankti Helena
+ Name[it]=Sant'Elena
+ Name[ja]=英領セントヘレナ島
+ Name[km]=សង់ហេឡេណា
+--- l10n/cy/entry.desktop	(revision 488815)
++++ l10n/cy/entry.desktop	(revision 494868)
+@@ -25,6 +25,7 @@
+ Name[hi]=साइप्रस
+ Name[hr]=Cipar
+ Name[hu]=Ciprus
++Name[is]=Kýpur
+ Name[it]=Cipro
+ Name[ja]=キプロス
+ Name[km]=ស៊ីពរ៍
+--- l10n/kr/entry.desktop	(revision 488815)
++++ l10n/kr/entry.desktop	(revision 494868)
+@@ -30,7 +30,7 @@
+ Name[hr]=Južna Koreja
+ Name[hu]=Dél-Korea
+ Name[id]=Korea Selatan
+-Name[is]=Suður Kórea
++Name[is]=Suður-Kórea
+ Name[it]=Corea del Sud
+ Name[ja]=大韓民国
+ Name[km]=កូរ៉េ​ខាង​ត្បូង
+--- l10n/cz/entry.desktop	(revision 488815)
++++ l10n/cz/entry.desktop	(revision 494868)
+@@ -28,6 +28,7 @@
+ Name[hi]=चेक
+ Name[hr]=Češka
+ Name[hu]=Csehország
++Name[is]=Tékkland
+ Name[it]=Repubblica Ceca
+ Name[ja]=&#