[pkg-kde-commits] rev 2688 - trunk/packages/kdegraphics/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Tue Dec 20 16:41:00 UTC 2005


Author: chrsmrtn
Date: 2005-12-20 16:40:59 +0000 (Tue, 20 Dec 2005)
New Revision: 2688

Added:
   trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r490050.diff
Log:
kdegraphics 3.5 branch pull.


Added: trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r490050.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r490050.diff	2005-12-20 16:28:53 UTC (rev 2687)
+++ trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r490050.diff	2005-12-20 16:40:59 UTC (rev 2688)
@@ -0,0 +1,3901 @@
+#DPATCHLEVEL=0
+--- kpdf/kpdf_part.desktop	(revision 484288)
++++ kpdf/kpdf_part.desktop	(revision 490050)
+@@ -4,7 +4,6 @@
+ Name=KPDF
+ Name[ar]=برنامج KPDF
+ Name[hi]=के-पीडीएफ
+-Name[xx]=xxKPDFxx
+ MimeType=application/pdf
+ InitialPreference=7
+ ServiceTypes=KParts/ReadOnlyPart
+--- kpdf/part.cpp	(revision 484288)
++++ kpdf/part.cpp	(revision 490050)
+@@ -274,6 +274,8 @@
+ 	connect( m_watcher, SIGNAL( dirty( const QString& ) ), this, SLOT( slotFileDirty( const QString& ) ) );
+ 	m_dirtyHandler = new QTimer( this );
+ 	connect( m_dirtyHandler, SIGNAL( timeout() ),this, SLOT( slotDoFileDirty() ) );
++	m_saveSplitterSizeTimer = new QTimer( this );
++	connect( m_saveSplitterSizeTimer, SIGNAL( timeout() ),this, SLOT( saveSplitterSize() ) );
+ 
+ 	slotNewConfig();
+ 
+@@ -478,7 +480,7 @@
+ {
+     // if pageView has been resized, save splitter sizes
+     if ( watched == m_pageView && e->type() == QEvent::Resize )
+-        saveSplitterSize();
++        m_saveSplitterSizeTimer->start(500, true);
+ 
+     // only intercept events, don't block them
+     return false;
+--- kpdf/part.h	(revision 484288)
++++ kpdf/part.h	(revision 490050)
+@@ -146,6 +146,11 @@
+ 	// static instances counter
+ 	static unsigned int m_count;
+ 
++	// this is a hack because we can not use writeConfig on part destructor
++	// and we don't want to writeconfig every time someone moves the splitter
++	// so we use a QTimer each 500 ms
++	QTimer *m_saveSplitterSizeTimer;
++
+ 	KDirWatch *m_watcher;
+ 	QTimer *m_dirtyHandler;
+ 	DocumentViewport m_viewportDirty;
+--- kpdf/xpdf/xpdf/JBIG2Stream.cc	(revision 484288)
++++ kpdf/xpdf/xpdf/JBIG2Stream.cc	(revision 490050)
+@@ -7,6 +7,7 @@
+ //========================================================================
+ 
+ #include <aconf.h>
++#include <limits.h>
+ 
+ #ifdef USE_GCC_PRAGMAS
+ #pragma implementation
+@@ -681,6 +682,12 @@
+   w = wA;
+   h = hA;
+   line = (wA + 7) >> 3;
++
++  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line ) {
++    data = NULL;
++    return;
++  }
++  
+   // need to allocate one extra guard byte for use in combine()
+   data = (Guchar *)gmalloc(h * line + 1);
+   data[h * line] = 0;
+@@ -692,6 +699,12 @@
+   w = bitmap->w;
+   h = bitmap->h;
+   line = bitmap->line;
++
++  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
++    data = NULL;
++    return;
++  }
++ 
+   // need to allocate one extra guard byte for use in combine()
+   data = (Guchar *)gmalloc(h * line + 1);
+   memcpy(data, bitmap->data, h * line);
+@@ -720,7 +733,8 @@
+ }
+ 
+ void JBIG2Bitmap::expand(int newH, Guint pixel) {
+-  if (newH <= h) {
++
++  if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) {
+     return;
+   }
+   // need to allocate one extra guard byte for use in combine()
+@@ -2305,6 +2319,15 @@
+     error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
+     return;
+   }
++  if (gridH == 0 || gridW >= INT_MAX / gridH) {
++    error(getPos(), "Bad size in JBIG2 halftone segment");
++    return;
++  }
++  if (h < 0 || w == 0 || h >= INT_MAX / w) {
++     error(getPos(), "Bad size in JBIG2 bitmap segment");
++    return;
++  }
++
+   patternDict = (JBIG2PatternDict *)seg;
+   bpp = 0;
+   i = 1;
+@@ -2936,6 +2959,9 @@
+   JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2;
+   int x, y, pix;
+ 
++  if (w < 0 || h <= 0 || w >= INT_MAX / h)
++    return NULL;
++
+   bitmap = new JBIG2Bitmap(0, w, h);
+   bitmap->clearToZero();
+ 
+--- kpdf/xpdf/xpdf/Stream.cc	(revision 484288)
++++ kpdf/xpdf/xpdf/Stream.cc	(revision 490050)
+@@ -15,6 +15,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
++#include <limits.h>
+ #ifndef WIN32
+ #include <unistd.h>
+ #endif
+@@ -408,13 +409,27 @@
+   width = widthA;
+   nComps = nCompsA;
+   nBits = nBitsA;
++  predLine = NULL;
++  ok = gFalse;
+ 
++  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
++      nComps >= INT_MAX / nBits ||
++      width >= INT_MAX / nComps / nBits)
++    return;
++
+   nVals = width * nComps;
++  if (nVals * nBits + 7 <= 0)
++    return;
+   pixBytes = (nComps * nBits + 7) >> 3;
+   rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
++  if (rowBytes < 0)
++    return;
++
+   predLine = (Guchar *)gmalloc(rowBytes);
+   memset(predLine, 0, rowBytes);
+   predIdx = rowBytes;
++
++  ok = gTrue;
+ }
+ 
+ StreamPredictor::~StreamPredictor() {
+@@ -1006,6 +1021,10 @@
+     FilterStream(strA) {
+   if (predictor != 1) {
+     pred = new StreamPredictor(this, predictor, columns, colors, bits);
++    if (!pred->isOk()) {
++      delete pred;
++      pred = NULL;
++    }
+   } else {
+     pred = NULL;
+   }
+@@ -1258,8 +1277,9 @@
+   endOfLine = endOfLineA;
+   byteAlign = byteAlignA;
+   columns = columnsA;
+-  if (columns < 1) {
+-    columns = 1;
++  if (columns < 1 || columns >= INT_MAX / sizeof(short)) {
++     error(getPos(), "Bad number of columns in CCITTFaxStream");
++     exit(1);
+   }
+   rows = rowsA;
+   endOfBlock = endOfBlockA;
+@@ -2903,7 +2923,12 @@
+   height = read16();
+   width = read16();
+   numComps = str->getChar();
+-  if (prec != 8) {
++  if (numComps <= 0 || numComps > 4) {
++    numComps = 0;
++    error(getPos(), "Bad number of components in DCT stream", prec);
++    return gFalse;
++  }
++ if (prec != 8) {
+     error(getPos(), "Bad DCT precision %d", prec);
+     return gFalse;
+   }
+@@ -2929,6 +2954,11 @@
+   height = read16();
+   width = read16();
+   numComps = str->getChar();
++  if (numComps <= 0 || numComps > 4) {
++    numComps = 0;
++    error(getPos(), "Bad number of components in DCT stream");
++    return gFalse;
++  }
+   if (prec != 8) {
+     error(getPos(), "Bad DCT precision %d", prec);
+     return gFalse;
+@@ -2951,6 +2981,11 @@
+ 
+   length = read16() - 2;
+   scanInfo.numComps = str->getChar();
++  if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
++    scanInfo.numComps = 0;
++    error(getPos(), "Bad number of components in DCT stream");
++    return gFalse;
++  }
+   --length;
+   if (length != 2 * scanInfo.numComps + 3) {
+     error(getPos(), "Bad DCT scan info block");
+@@ -3035,12 +3070,12 @@
+   while (length > 0) {
+     index = str->getChar();
+     --length;
+-    if ((index & 0x0f) >= 4) {
++    if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) {
+       error(getPos(), "Bad DCT Huffman table");
+       return gFalse;
+     }
+     if (index & 0x10) {
+-      index &= 0x0f;
++      index &= 0x03;
+       if (index >= numACHuffTables)
+ 	numACHuffTables = index+1;
+       tbl = &acHuffTables[index];
+@@ -3833,6 +3868,10 @@
+     FilterStream(strA) {
+   if (predictor != 1) {
+     pred = new StreamPredictor(this, predictor, columns, colors, bits);
++    if (!pred->isOk()) {
++      delete pred;
++      pred = NULL;
++    }
+   } else {
+     pred = NULL;
+   }
+--- kpdf/xpdf/xpdf/Stream.h	(revision 484288)
++++ kpdf/xpdf/xpdf/Stream.h	(revision 490050)
+@@ -232,6 +232,8 @@
+ 
+   ~StreamPredictor();
+ 
++  GBool isOk() { return ok; }
++
+   int lookChar();
+   int getChar();
+ 
+@@ -249,6 +251,7 @@
+   int rowBytes;			// bytes per line
+   Guchar *predLine;		// line buffer
+   int predIdx;			// current index in predLine
++  GBool ok;
+ };
+ 
+ //------------------------------------------------------------------------
+--- kpdf/xpdf/xpdf/Page.cc	(revision 484288)
++++ kpdf/xpdf/xpdf/Page.cc	(revision 490050)
+@@ -66,6 +66,20 @@
+   if (!haveCropBox) {
+     cropBox = mediaBox;
+   }
++  else
++  {
++    // cropBox can not be bigger than mediaBox
++    if (cropBox.x2 - cropBox.x1 > mediaBox.x2 - mediaBox.x1)
++    {
++      cropBox.x1 = mediaBox.x1;
++      cropBox.x2 = mediaBox.x2;
++    }
++    if (cropBox.y2 - cropBox.y1 > mediaBox.y2 - mediaBox.y1)
++    {
++      cropBox.y1 = mediaBox.y1;
++      cropBox.y2 = mediaBox.y2;
++    }
++  }
+ 
+   // other boxes
+   bleedBox = cropBox;
+--- kpdf/xpdf/xpdf/JPXStream.cc	(revision 484288)
++++ kpdf/xpdf/xpdf/JPXStream.cc	(revision 490050)
+@@ -7,6 +7,7 @@
+ //========================================================================
+ 
+ #include <aconf.h>
++#include <limits.h>
+ 
+ #ifdef USE_GCC_PRAGMAS
+ #pragma implementation
+@@ -783,7 +784,7 @@
+   int segType;
+   GBool haveSIZ, haveCOD, haveQCD, haveSOT;
+   Guint precinctSize, style;
+-  Guint segLen, capabilities, comp, i, j, r;
++  Guint segLen, capabilities, nTiles, comp, i, j, r;
+ 
+   //----- main header
+   haveSIZ = haveCOD = haveQCD = haveSOT = gFalse;
+@@ -818,8 +819,13 @@
+ 	            / img.xTileSize;
+       img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
+ 	            / img.yTileSize;
+-      img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
+-				     sizeof(JPXTile));
++      nTiles = img.nXTiles * img.nYTiles;
++      // check for overflow before allocating memory
++      if (img.nXTiles <= 0 || img.nYTiles <= 0 || img.nXTiles >= INT_MAX / img.nYTiles) {
++	error(getPos(), "Bad tile count in JPX SIZ marker segment");
++	return gFalse;
++      }
++      img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile));
+       for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
+ 	img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps,
+ 							sizeof(JPXTileComp));
+--- kpdf/xpdf/goo/gmem.c	(revision 484288)
++++ kpdf/xpdf/goo/gmem.c	(revision 490050)
+@@ -11,6 +11,7 @@
+ #include <stdlib.h>
+ #include <stddef.h>
+ #include <string.h>
++#include <limits.h>
+ #include "gmem.h"
+ 
+ #ifdef DEBUG_MEM
+@@ -141,7 +142,7 @@
+   int n;
+ 
+   n = nObjs * objSize;
+-  if (objSize == 0 || n / objSize != nObjs) {
++  if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
+     fprintf(stderr, "Bogus memory allocation size\n");
+     exit(1);
+   }
+@@ -152,7 +153,7 @@
+   int n;
+ 
+   n = nObjs * objSize;
+-  if (objSize == 0 || n / objSize != nObjs) {
++  if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
+     fprintf(stderr, "Bogus memory allocation size\n");
+     exit(1);
+   }
+--- kpdf/shell/kpdf.desktop	(revision 484288)
++++ kpdf/shell/kpdf.desktop	(revision 490050)
+@@ -5,7 +5,6 @@
+ Name=KPDF
+ Name[ar]=برنامج KPDF
+ Name[hi]=के-पीडीएफ
+-Name[xx]=xxKPDFxx
+ GenericName=PDF Viewer
+ GenericName[ar]=عارض ملفات PDF
+ GenericName[az]=PDF Nümayişçisi
+@@ -62,7 +61,6 @@
+ GenericName[uz]=PDF кўрувчи
+ GenericName[ven]=Tshivhoni tsha PDF
+ GenericName[xh]=Umboniseli we PDF
+-GenericName[xx]=xxPDF Viewerxx
+ GenericName[zh_CN]=PDF 查看器
+ GenericName[zu]=Umboniseli we PDF
+ Exec=kpdf %U %i %m -caption "%c"
+--- kpdf/part.rc	(revision 484288)
++++ kpdf/part.rc	(revision 490050)
+@@ -35,7 +35,7 @@
+     <Separator/>
+     <Action name="goto_page"/>
+   </Menu>
+-  <Menu name="mouseMode"><text>&amp;Tools</text>
++  <Menu name="tools"><text>&amp;Tools</text>
+     <Action name="mouse_drag"/>
+     <Action name="mouse_zoom"/>
+     <Action name="mouse_select"/>
+--- kpdf/ui/presentationwidget.cpp	(revision 484288)
++++ kpdf/ui/presentationwidget.cpp	(revision 490050)
+@@ -171,12 +171,14 @@
+ 
+ 
+ // <widget events>
++/* This hack was here to fix 103718 but it's no longer necessary on KDE 3.5 and Lubos asked me to remove it
+ bool PresentationWidget::event ( QEvent * e )
+ {
+     if (e -> type() == QEvent::WindowDeactivate) KWin::clearState(winId(), NET::StaysOnTop);
+     else if (e -> type() == QEvent::WindowActivate) KWin::setState(winId(), NET::StaysOnTop);
+     return QDialog::event(e);
+ }
++*/
+ 
+ void PresentationWidget::keyPressEvent( QKeyEvent * e )
+ {
+--- kpdf/ui/presentationwidget.h	(revision 484288)
++++ kpdf/ui/presentationwidget.h	(revision 490050)
+@@ -46,7 +46,7 @@
+ 
+     protected:
+         // widget events
+-        bool event( QEvent * e );
++//        bool event( QEvent * e );
+         void keyPressEvent( QKeyEvent * e );
+         void wheelEvent( QWheelEvent * e );
+         void mousePressEvent( QMouseEvent * e );
+--- kfaxview/kfaxmultipage_tiff.desktop	(revision 484288)
++++ kfaxview/kfaxmultipage_tiff.desktop	(revision 490050)
+@@ -3,7 +3,6 @@
+ Name=kfaxview_tiff
+ Name[da]=Kfaxview TIFF
+ Name[sv]=Kfaxview TIFF
+-Name[xx]=xxkfaxview_tiffxx
+ Name[zh_CN]=KFaxView_tiff
+ Icon=kfaxview
+ Type=Service
+@@ -14,9 +13,12 @@
+ Comment[cs]=KViewShell modul pro faxové soubory
+ Comment[da]=Kviewshell-plugin for telefaxfiler
+ Comment[de]=Ein Modul für KViewShell zum Betrachten von Faxdateien
++Comment[el]=Πρόσθετο του KViewShell για αρχεία φαξ
+ Comment[es]=Extensión KViewShell para archivos de fax
+ Comment[et]=KView faksifailide plugin
++Comment[eu]=Fax fitxategientzatko KViewShell-en plugina
+ Comment[fr]=Module KViewShell pour les fichiers fax
++Comment[hu]=KViewShell-modul faxfájlokhoz
+ Comment[is]=KViewShell íforrit fyrir faxskrár
+ Comment[it]=Plugin KViewShell per file di fax
+ Comment[ja]=FAX ファイル用の KViewShell プラグイン
+@@ -33,7 +35,6 @@
+ Comment[sv]=Kviewshell-insticksprogram för telefaxfiler
+ Comment[tr]=Faks dosyaları için KViewShell eklentisi
+ Comment[uk]=Втулок перегляду файлів факсів для KViewShell
+-Comment[xx]=xxKViewShell plugin for fax filesxx
+ Comment[zh_CN]=传真文件的 KViewShell 插件
+ ServiceTypes=KViewShell/MultiPage
+ X-KDE-MimeTypes=image/tiff
+--- kfaxview/kfaxmultipage.desktop	(revision 484288)
++++ kfaxview/kfaxmultipage.desktop	(revision 490050)
+@@ -1,10 +1,10 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=kfaxview
++Name[hu]=KFaxView
+ Name[ja]=KfaxView
+ Name[nb]=Kfaxview
+ Name[sv]=Kfaxview
+-Name[xx]=xxkfaxviewxx
+ Name[zh_CN]=KFaxView
+ Icon=kfaxview
+ Type=Service
+@@ -15,9 +15,12 @@
+ Comment[cs]=KViewShell modul pro faxové soubory
+ Comment[da]=Kviewshell-plugin for telefaxfiler
+ Comment[de]=Ein Modul für KViewShell zum Betrachten von Faxdateien
++Comment[el]=Πρόσθετο του KViewShell για αρχεία φαξ
+ Comment[es]=Extensión KViewShell para archivos de fax
+ Comment[et]=KView faksifailide plugin
++Comment[eu]=Fax fitxategientzatko KViewShell-en plugina
+ Comment[fr]=Module KViewShell pour les fichiers fax
++Comment[hu]=KViewShell-modul faxfájlokhoz
+ Comment[is]=KViewShell íforrit fyrir faxskrár
+ Comment[it]=Plugin KViewShell per file di fax
+ Comment[ja]=FAX ファイル用の KViewShell プラグイン
+@@ -34,7 +37,6 @@
+ Comment[sv]=Kviewshell-insticksprogram för telefaxfiler
+ Comment[tr]=Faks dosyaları için KViewShell eklentisi
+ Comment[uk]=Втулок перегляду файлів факсів для KViewShell
+-Comment[xx]=xxKViewShell plugin for fax filesxx
+ Comment[zh_CN]=传真文件的 KViewShell 插件
+ ServiceTypes=KViewShell/MultiPage
+ X-KDE-MimeTypes=image/fax-g3
+--- kfaxview/kfaxview.desktop	(revision 484288)
++++ kfaxview/kfaxview.desktop	(revision 490050)
+@@ -52,14 +52,12 @@
+ GenericName[ven]=Muvhoni wa Fekisi
+ GenericName[wa]=Håyneu di facs
+ GenericName[xh]=Umboniseli Wefax
+-GenericName[xx]=xxFax Viewerxx
+ GenericName[zh_CN]=传真查看器
+ GenericName[zh_TW]=傳真檢視器
+ GenericName[zu]=Umbonisi wefax
+ Name=KFaxView
+ Name[nb]=Kfaxview
+ Name[sv]=Kfaxview
+-Name[xx]=xxKFaxViewxx
+ MimeType=image/fax-g3
+ InitialPreference=6
+ Exec=kfaxview %f
+--- kview/kimageviewer/kimageviewercanvas.desktop	(revision 484288)
++++ kview/kimageviewer/kimageviewercanvas.desktop	(revision 490050)
+@@ -31,7 +31,7 @@
+ Comment[nl]=Ingebed weergave-canvas (widget die een afbeelding toont)
+ Comment[nn]=Inkluderbart lerret for biletvising (skjermelement som viser eit bilete)
+ Comment[nso]=Canvas yeo e Robatsegago ya Molebeledi wa Ponagalo (widget yeo e bontshago ponagalo)
+-Comment[pl]=Obszar do przeglądania obrazów (wnętrze okienka, które pokazuje obraz)
++Comment[pl]=Obszar do przeglądania obrazków (wnętrze okienka, które pokazuje obrazek)
+ Comment[pt]=Área de Visualização Embebida de Imagens (um item que mostra uma imagem)
+ Comment[pt_BR]=Componente Integrado do Visualizador Canvas (componente que exibe uma imagem)
+ Comment[ro]=Componentă înglobată de vizualizare imagini (widget)
+@@ -48,7 +48,6 @@
+ Comment[uk]=Вмонтовний компонент полотна перегляду зображень (віджет, що малює зображення)
+ Comment[ven]=Muvhala wa muvhoni wa tshifanyiso tsho dzheniswaho (tshishumiswa tsha vhuthogwa tshine tsha sumbedza tshifanyiso)
+ Comment[xh]=Iseyile Yombonisi Womfanekiso Olungisiweyo (widget ebonisa umfanekiso)
+-Comment[xx]=xxEmbeddable Image Viewer Canvas (widget that shows an image)xx
+ Comment[zh_CN]=可嵌入的图像查看画布(显示图像的部件)
+ Comment[zh_TW]=可嵌入的影像檢視器畫布(顯示影像的界面工具)
+ Comment[zu]=Inkalivasi Yombukisi Wesithombe Esixubeneyo (i-widget ekhombisa isithombe)
+--- kview/kimageviewer/kimageviewer.desktop	(revision 484288)
++++ kview/kimageviewer/kimageviewer.desktop	(revision 490050)
+@@ -34,7 +34,7 @@
+ Comment[nl]=Ingebed weergavecomponent voor afbeeldingen
+ Comment[nn]=Inkluderbart komponent for biletvising
+ Comment[nso]=Seripa seo se Robatsegago sa Molebeledi wa Ponagalo
+-Comment[pl]=Składnik do przeglądania obrazów
++Comment[pl]=Składnik do przeglądania obrazków
+ Comment[pt]=Componente Embebida de Visualização de Imagens
+ Comment[pt_BR]=Componente Integrado do Visualizador de Imagens
+ Comment[ro]=Componentă înglobată de vizualizare imagini
+@@ -51,7 +51,6 @@
+ Comment[uk]=Вмонтовний компонент перегляду зображень
+ Comment[ven]=Tshipida tsha muvhoni wa tshifanyiso tsho dzheniswaho
+ Comment[xh]=Ingxenye Yombonisi Womfanekiso Olungisiweyo
+-Comment[xx]=xxEmbeddable Image Viewer Componentxx
+ Comment[zh_CN]=可嵌入的图像查看器组件
+ Comment[zh_TW]=可嵌入的影像檢視器元件
+ Comment[zu]=Ilunga Lombukisi Wesithombe Esixubeneyo
+--- kview/kviewcanvas/config/kviewcanvasconfig.desktop	(revision 484288)
++++ kview/kviewcanvas/config/kviewcanvasconfig.desktop	(revision 490050)
+@@ -39,7 +39,7 @@
+ Name[nl]=Weergaveprogramma
+ Name[nn]=Framvisar
+ Name[pa]=ਦਰਸ਼ਕ
+-Name[pl]=Przeglądarka obrazów
++Name[pl]=Przeglądarka obrazków
+ Name[pt]=Visualizador
+ Name[pt_BR]=Visualizador
+ Name[ro]=Vizualizor
+@@ -56,7 +56,6 @@
+ Name[uk]=Переглядач
+ Name[uz]=Кўрувчи
+ Name[wa]=Håyneu
+-Name[xx]=xxViewerxx
+ Name[zh_CN]=查看器
+ Comment=General KViewCanvas Configuration
+ Comment[ar]=اعدادات KViewCanvas العامة
+@@ -97,5 +96,4 @@
+ Comment[tg]=Танзимоти умумии KViewCanvas
+ Comment[tr]=Genel KView Ekran Ayarları
+ Comment[uk]=Загальні параметри KViewCanvas
+-Comment[xx]=xxGeneral KViewCanvas Configurationxx
+ Comment[zh_CN]=KViewCanvas 常规配置
+--- kview/kviewcanvas/kviewcanvas.desktop	(revision 484288)
++++ kview/kviewcanvas/kviewcanvas.desktop	(revision 490050)
+@@ -30,7 +30,7 @@
+ Name[nl]=KView afbeeldingwidget
+ Name[nn]=KView biletvisarelement
+ Name[nso]=KView Widget ya Molebeledi wa Ponagalo
+-Name[pl]=Okienko przeglądarki obrazów KView
++Name[pl]=Okienko przeglądarki obrazków KView
+ Name[pt]=Elemento de Visualização de Imagens do KView
+ Name[pt_BR]=Componente de Visualização de Imagens do KVisualização
+ Name[ro]=Widget vizualizare imagini KView
+@@ -48,7 +48,6 @@
+ Name[ven]=Tshishumiswa tsha vhuthogwa tsha muvhoni wa tshifanyiso tsha mbonalelo ya K
+ Name[wa]=Ahesse håyneu d' imådjes KView 
+ Name[xh]=Widget Yombonisi Womfanekiso we KView
+-Name[xx]=xxKView Image Viewer Widgetxx
+ Name[zh_CN]=KView 图像查看器部件
+ Name[zh_TW]=KView 影像檢視器界面工具
+ Name[zu]=I-widget Yombukisi Wesithombe se-KView
+--- kview/kview.desktop	(revision 484288)
++++ kview/kview.desktop	(revision 490050)
+@@ -62,7 +62,6 @@
+ GenericName[ven]=Tshivhoni tsha Mutaleli
+ GenericName[wa]=Håyneu d' imådjes
+ GenericName[xh]=Umboniseli Womfanekiso
+-GenericName[xx]=xxImage Viewerxx
+ GenericName[zh_CN]=图片查看程序
+ GenericName[zh_TW]=影像檢視程式
+ GenericName[zu]=Umbonisi Womfanekiso
+@@ -75,13 +74,12 @@
+ Name[hi]=के-व्यू
+ Name[hr]=Preglednik slika
+ Name[lv]=KSkatīt
+-Name[pl]=Przeglądarka obrazów
++Name[pl]=Przeglądarka obrazków
+ Name[pt_BR]=KVisualização
+ Name[sv]=Kview
+ Name[ta]=கேகாட்சி
+ Name[th]=ดูภาพ - K
+ Name[ven]=U vhona ha K
+-Name[xx]=xxKViewxx
+ Name[zh_TW]=KView 檢視器
+ InitialPreference=3
+ X-KDE-StartupNotify=true
+--- kview/photobook/photobook.desktop	(revision 484288)
++++ kview/photobook/photobook.desktop	(revision 490050)
+@@ -29,7 +29,6 @@
+ GenericName[sv]=Fotoalbum
+ GenericName[ta]=புகைப்படப் புத்தகம்
+ GenericName[tr]=Albüm
+-GenericName[xx]=xxPhotobookxx
+ 
+ MimeType=inode/directory
+ Icon=photobook
+@@ -58,7 +57,6 @@
+ Name[sv]=Fotoalbum
+ Name[ta]=புகைப்படப் புத்தகம்
+ Name[tr]=Albüm
+-Name[xx]=xxPhotobookxx
+ Comment=Easily browse a folder of photographs
+ Comment[bg]=Колекциониране на снимки като във фотоалбум
+ Comment[ca]=Mirar fàcilment una carpeta de fotografies
+@@ -91,7 +89,6 @@
+ Comment[ta]=புகைப்படங்களின் அடைவை சுலபமாக உலாவ
+ Comment[tr]=Fotoğraflarla dolu bir dizini kolayca gez
+ Comment[uk]=Простий перегляд тек з фотографіями
+-Comment[xx]=xxEasily browse a folder of photographsxx
+ Comment[zh_CN]=轻松浏览照片文件夹
+ ServiceTypes=KParts/ReadOnlyPart,Browser/View
+ X-KDE-Library=libphotobook
+--- kview/config/kviewgeneralconfig.desktop	(revision 484288)
++++ kview/config/kviewgeneralconfig.desktop	(revision 490050)
+@@ -68,7 +68,6 @@
+ Name[ven]=Apulifikhesheni
+ Name[wa]=Programe
+ Name[xh]=Isicelo
+-Name[xx]=xxApplicationxx
+ Name[zh_CN]=应用程序
+ Name[zu]=Isicelo
+ Comment=Configuration for the standalone Version of KView
+@@ -80,6 +79,7 @@
+ Comment[cy]=Ffurfweddiad ar gyfer y fersiwn arunigol o KGweld
+ Comment[da]=Indstilling af den alenestående udgave af KView
+ Comment[de]=Einstellungen für die Anwendung KView
++Comment[el]=Ρύθμιση της standalone έκδοσης του KView
+ Comment[es]=Configuración para la versión independiente de KView
+ Comment[et]=KView iseseisva versiooni seadistus
+ Comment[eu]=KView programaren konfigurazioa
+@@ -110,5 +110,4 @@
+ Comment[tg]=Танзимоти барномаи мустақили KView
+ Comment[tr]=KView programının yanlız sürümünün ayarları
+ Comment[uk]=Налаштування KView, як окреиої програми
+-Comment[xx]=xxConfiguration for the standalone Version of KViewxx
+ Comment[zh_CN]=KView 标准版本的配置
+--- kview/config/plugins/kviewpluginsconfig.desktop	(revision 484288)
++++ kview/config/plugins/kviewpluginsconfig.desktop	(revision 490050)
+@@ -56,7 +56,6 @@
+ Name[uk]=Втулки
+ Name[uz]=Плагинлар
+ Name[wa]=Tchôke-divins
+-Name[xx]=xxPluginsxx
+ Name[zh_CN]=插件
+ Comment=Choose and Configure Your Plugins
+ Comment[bg]=Избор и конфигуриране на приставки
+@@ -92,5 +91,4 @@
+ Comment[tr]=Eklentilerinizi Seçin ve Yapılandırın:
+ Comment[uk]=Виберіть та налаштуйте ваші втулки
+ Comment[uz]=Плагинларни танлаш ва мослаш
+-Comment[xx]=xxChoose and Configure Your Pluginsxx
+ Comment[zh_CN]=选择并配置您的插件
+--- kview/config/kview.setdlg	(revision 484288)
++++ kview/config/kview.setdlg	(revision 490050)
+@@ -26,7 +26,7 @@
+ Name[nl]=Weergaveprogramma
+ Name[nn]=Framvisar
+ Name[pa]=ਦਰਸ਼ਕ
+-Name[pl]=Przeglądarka obrazów
++Name[pl]=Przeglądarka obrazków
+ Name[pt]=Visualizador
+ Name[pt_BR]=Visualizador
+ Name[ro]=Vizualizor
+@@ -43,7 +43,6 @@
+ Name[uk]=Переглядач
+ Name[uz]=Кўрувчи
+ Name[wa]=Håyneu
+-Name[xx]=xxViewerxx
+ Name[zh_CN]=查看器
+ Comment=This is the configuration for the part of KView that can be reused by other applications (meaning that the settings will also affect the KView part that gets embedded into Konqueror or other applications).
+ Comment[ar]=هذه الإعدادات هي لجزء برنامج KView الذي يدمج في داخل متصفح Konqueror والبرامج الأخرى
+@@ -81,7 +80,6 @@
+ Comment[tg]=Танзимоти қисмати KView, ки бо дигар барномаҳо (рафтори қисматро, ки ба дохили Konqueror ҷорӣ шудааст ё дигар барномаҳоро низ танзим мекунад) истифода мешавад.
+ Comment[tr]=Bu KView'in diğer programlar tarafından tekrar kullanılabilecek ayarlarıdır (Bu KView'in Konqueror veya diğer programlar altında çalışan gömülü parçalarını da etkiler).
+ Comment[uk]=Це параметри складової KView, які можуть бути використані багатьма програмами (тобто, зміни значеннь цих параметрів будуть впливати на складову KView вмонтовану у Konqueror та інші програми).
+-Comment[xx]=xxThis is the configuration for the part of KView that can be reused by other applications (meaning that the settings will also affect the KView part that gets embedded into Konqueror or other applications).xx
+ Comment[zh_CN]=这是可被其它应用程序重用的 KView 部分的配置(这意味着,这里的设置也会影响嵌入到 Konqueror 或其它应用程序中的 KView 部分)。
+ Weight=1
+ [Application]
+@@ -141,7 +139,6 @@
+ Name[ven]=Apulifikhesheni
+ Name[wa]=Programe
+ Name[xh]=Isicelo
+-Name[xx]=xxApplicationxx
+ Name[zh_CN]=应用程序
+ Name[zu]=Isicelo
+ Comment=Here you can set options that are special for the KView application when running stand-alone. What you change in here will not affect other applications.
+@@ -181,6 +178,5 @@
+ Comment[tg]=Танзимоти барномаи KView, ки ҷудо оғоз шуда буд. Ин танзимотҳо дигар барномаҳоро, ки дар он қисмати KView дохил мешавад дар бар намегирад.
+ Comment[tr]=Burada KView programı yanlız (standalone) çalışırken özel olan seçeneklerinizi belirleyebilirsiniz. Burada yaptığınız değişiklikler diğer programları etkilemeyecektir.
+ Comment[uk]=Тут Ви можете встановити значення параметрів для програми KView, коли вона виконується окремо. Зміни тут не будуть впливати на інші програми.
+-Comment[xx]=xxHere you can set options that are special for the KView application when running stand-alone. What you change in here will not affect other applications.xx
+ Comment[zh_CN]=您可在此设定 KView 应用程序以独立形式运行时的特殊选项。您在此所在的更改不会影响其它应用程序。
+ Weight=5
+--- kview/kviewviewer/kviewviewer.desktop	(revision 484288)
++++ kview/kviewviewer/kviewviewer.desktop	(revision 490050)
+@@ -32,7 +32,7 @@
+ Comment[nn]=Biletvisardel for KDE
+ Comment[nso]=Seripa sa Molebeledi wa Ponagalo sa KDE
+ Comment[pa]=KDE ਚਿੱਤਰ ਦਰਸ਼ਕ ਭਾਗ
+-Comment[pl]=Składnik do przeglądarka obrazów KDE
++Comment[pl]=Składnik do przeglądarka obrazków KDE
+ Comment[pt]=Componente de Visualização de Imagens do KDE
+ Comment[pt_BR]=Parte do Visualizador de Imagens do KDE
+ Comment[ro]=Componentă KDE de vizualizare imagini
+@@ -49,7 +49,6 @@
+ Comment[uk]=Складова KDE переглядача зображень
+ Comment[ven]=Tshipida tsha muvhoni wa tshifanyiso tsha KDE
+ Comment[xh]=Iqhekeza Lombonisi Womfanekiso we KDE
+-Comment[xx]=xxKDE Image Viewer Partxx
+ Comment[zh_CN]=KDE 图像查看器组件
+ Comment[zh_TW]=KDE 影像檢視器組件
+ Comment[zu]=Ingxenye Yombukisi Wesithombe se-KDE
+@@ -96,7 +95,6 @@
+ Name[tr]=KView Resim Görüntüleyici
+ Name[uk]=Переглядач зображень KView
+ Name[wa]=KView Håyneu d' imådjes
+-Name[xx]=xxKView Image Viewerxx
+ Name[zh_CN]=KView 图像查看器
+ ServiceTypes=KImageViewer/Viewer,KParts/ReadWritePart,Browser/View
+ InitialPreference=3
+--- kview/kviewviewer/config/kviewviewerpluginsconfig.desktop	(revision 484288)
++++ kview/kviewviewer/config/kviewviewerpluginsconfig.desktop	(revision 490050)
+@@ -56,7 +56,6 @@
+ Name[uk]=Втулки
+ Name[uz]=Плагинлар
+ Name[wa]=Tchôke-divins
+-Name[xx]=xxPluginsxx
+ Name[zh_CN]=插件
+ Comment=Choose and Configure Your Plugins
+ Comment[bg]=Избор и конфигуриране на приставки
+@@ -92,5 +91,4 @@
+ Comment[tr]=Eklentilerinizi Seçin ve Yapılandırın:
+ Comment[uk]=Виберіть та налаштуйте ваші втулки
+ Comment[uz]=Плагинларни танлаш ва мослаш
+-Comment[xx]=xxChoose and Configure Your Pluginsxx
+ Comment[zh_CN]=选择并配置您的插件
+--- kview/modules/effects/kvieweffects.desktop	(revision 484288)
++++ kview/modules/effects/kvieweffects.desktop	(revision 490050)
+@@ -54,7 +54,6 @@
+ Name[uk]=Ефекти
+ Name[uz]=Эффектлар
+ Name[wa]=Efets
+-Name[xx]=xxEffectsxx
+ Name[zh_CN]=特效
+ Comment=Provides some image effects
+ Comment[ar]=يقدم بعض مؤثرات الصور
+@@ -96,5 +95,4 @@
+ Comment[tr]=Resim efektleri oluşturur
+ Comment[uk]=Надає деякі ефекти зображень
+ Comment[uz]=Расм эффектлари
+-Comment[xx]=xxProvides some image effectsxx
+ Comment[zh_CN]=提供某些图像特效
+--- kview/modules/browser/kviewbrowser.desktop	(revision 484288)
++++ kview/modules/browser/kviewbrowser.desktop	(revision 490050)
+@@ -61,7 +61,6 @@
+ Name[ven]=Burausa
+ Name[wa]=Foyteuse
+ Name[xh]=Umkhangeli wencwadi
+-Name[xx]=xxBrowserxx
+ Name[zh_CN]=浏览器
+ Name[zh_TW]=瀏覽器
+ Name[zu]=Umcingi
+@@ -110,7 +109,6 @@
+ Comment[ven]=Ini konisa u tshimbidza kha zwifanyiso zwothe kha tsumbavhulwo ya zwino.
+ Comment[wa]=Vos permete di foyter dins totes les imådjes do ridant do moumint.
+ Comment[xh]=Ikuvumela ukuba ukwazi ukukhangela yonke imifanekiso kulawulo lwangoku.
+-Comment[xx]=xxEnables you to browse through all of the images in the current directory.xx
+ Comment[zh_CN]=使您能够浏览当前目录中的所有图像。
+ Comment[zh_TW]=讓您瀏覽目前目錄的所有影像。
+ Comment[zu]=Ikuvumela ukuba ucinge ngokwedlulela izithombe ohlwini lwamafayela lwamanje.
+--- kview/modules/presenter/config/kviewpresenterconfig.desktop	(revision 484288)
++++ kview/modules/presenter/config/kviewpresenterconfig.desktop	(revision 490050)
+@@ -51,7 +51,6 @@
+ Name[uk]=Назва
+ Name[uz]=Номи
+ Name[wa]=No
+-Name[xx]=xxNamexx
+ Name[zh_CN]=名称
+ Comment=Comment
+ Comment[ar]=تعليق
+@@ -97,5 +96,4 @@
+ Comment[uk]=Коментар
+ Comment[uz]=Изоҳ
+ Comment[wa]=Rawete
+-Comment[xx]=xxCommentxx
+ Comment[zh_CN]=注释
+--- kview/modules/presenter/kviewpresenter.desktop	(revision 484288)
++++ kview/modules/presenter/kviewpresenter.desktop	(revision 490050)
+@@ -53,7 +53,6 @@
+ Name[tr]=Sunum Aracı
+ Name[ven]=Mulanguli
+ Name[xh]=Umbonisi
+-Name[xx]=xxPresenterxx
+ Name[zh_CN]=演示板
+ Name[zh_TW]=簡報
+ Name[zu]=Umnikeli
+@@ -101,7 +100,6 @@
+ Comment[uk]=Створює список зображень та дозволяє створювати презентацію слайдів
+ Comment[ven]=Iita mutevhe wa tshifanyiso ya dovha yani tendela uita tsumbedzo ya tshilaidi
+ Comment[xh]=Yenza uluhlu lwemifanekiso ekuvumela ukwazi ukwenza umboniso wotyibiliko
+-Comment[xx]=xxCreates an imagelist and enables you to create a slideshowxx
+ Comment[zh_CN]=创建图像列表,并能为您创建幻灯片
+ Comment[zh_TW]=建立影像清單並讓您能建立幻燈片式放映
+ Comment[zu]=Idala uhlu lwesithombe futhi ikuvumela wena ukuba udale umbukiso wesithombe esishibilikayo
+--- kview/modules/scale/kview_scale.desktop	(revision 484288)
++++ kview/modules/scale/kview_scale.desktop	(revision 490050)
+@@ -49,7 +49,6 @@
+ Name[ven]=Tshikeili
+ Name[wa]=Al schåle
+ Name[xh]=Isikali
+-Name[xx]=xxScalexx
+ Name[zh_CN]=缩放
+ Name[zh_TW]=縮放
+ Name[zu]=Isikali
+@@ -83,7 +82,7 @@
+ Comment[nl]=Filter om de afbeelding te schalen
+ Comment[nn]=Filter for skalering av biletet
+ Comment[nso]=Sesekodi sago kala ponagalo
+-Comment[pl]=Filtr do przeskalowywania obrazow
++Comment[pl]=Filtr do skalowania obrazków
+ Comment[pt]=Um filtro para escalar a imagem
+ Comment[pt_BR]=Filtro para escalar a imagem
+ Comment[ro]=Filtru de scalat imaginea
+@@ -101,7 +100,6 @@
+ Comment[ven]=Faela yau kala tshifanyiso
+ Comment[wa]=Passete po mete l' imådje al schåle
+ Comment[xh]=Icebo lokucoca ulwelo lokukala umfanekiso
+-Comment[xx]=xxFilter to scale the imagexx
+ Comment[zh_CN]=缩放图像的滤镜
+ Comment[zh_TW]=用來縮放影像的濾鏡
+ Comment[zu]=Hluza isithombe esikaleni
+--- kview/modules/scanner/kviewscanner.desktop	(revision 484288)
++++ kview/modules/scanner/kviewscanner.desktop	(revision 490050)
+@@ -59,7 +59,6 @@
+ Name[ven]=Tshinanguludzi
+ Name[wa]=Sicanrece
+ Name[xh]=Umvavanyi
+-Name[xx]=xxScannerxx
+ Name[zh_CN]=扫描仪
+ Name[zh_TW]=掃描器
+ Name[zu]=Umhloli
+@@ -91,7 +90,7 @@
+ Comment[nl]=Scan afbeeldingen rechtstreeks in KView
+ Comment[nn]=Opnar bilete frå skannaren i KView
+ Comment[nso]=Bula diponagalo gotswa go selebeledi sa gago goya kago KView
+-Comment[pl]=Otwiera obrazy ze skanera w przeglądarce KView
++Comment[pl]=Otwiera obrazki ze skanera w przeglądarce KView
+ Comment[pt]=Abrir as imagens do seu 'scanner' no KView
+ Comment[pt_BR]=Abre imagens do seu digitalizador no KVisualização
+ Comment[ro]=Deschide imagini din scaner în KView
+@@ -109,7 +108,6 @@
+ Comment[ven]=Vulani zwifanyiso ubva kha tshinanguludzi uya kha mbonalelo ya K
+ Comment[wa]=Drovi des imådjes di vosse sicanrece avou KView
+ Comment[xh]=Vula imifanekiso evela kumvavanyisi wakho kwi KView
+-Comment[xx]=xxOpen images from your scanner into KViewxx
+ Comment[zh_CN]=从您的扫描仪中打开图像至 KView
+ Comment[zh_TW]=從您的掃描器開啟影像至 KView
+ Comment[zu]=Vula izithombe ezisuka kumhloli wakho kwi-KView
+--- kview/modules/template/kviewtemplate.desktop	(revision 484288)
++++ kview/modules/template/kviewtemplate.desktop	(revision 490050)
+@@ -59,7 +59,6 @@
+ Name[uk]=Шаблон
+ Name[uz]=Намуна
+ Name[wa]=Modele
+-Name[xx]=xxTemplatexx
+ Name[zh_CN]=模板
+ Name[zh_TW]=範本
+ Name[zu]=i-template
+@@ -110,7 +109,6 @@
+ Comment[ven]=Thalutshedzo khulwane ya ine plugin ya ita zwone
+ Comment[wa]=On discrijhaedje pus complet di çou k' est fwait på tchôke-divins
+ Comment[xh]=Inkcazelo ende echaza ukuba iplagi ezingaphakathi zenza ntoni na
+-Comment[xx]=xxA longer description of what the plugin doesxx
+ Comment[zh_CN]=这里应该填写插件功能详细一点的描述
+ Comment[zh_TW]=關於這個外掛程式的所做所為的較長描述
+ Comment[zu]=incazelo ende yokuthi i-plugin yenzani
+--- libkscan/scanservice.desktop	(revision 484288)
++++ libkscan/scanservice.desktop	(revision 490050)
+@@ -55,7 +55,6 @@
+ Name[ven]=Tshishumiswa tshau naga tsha KDE
+ Name[wa]=Siervice di scanaedje di KDE
+ Name[xh]=Inkonzo yemita yovavanyo ye KDE
+-Name[xx]=xxKDE Scan Servicexx
+ Name[zh_CN]=KDE 扫描服务
+ Name[zh_TW]=KDE 掃描服務
+ Name[zu]=Umsebenzi Lokuhlola lwe-KDE
+--- kpovmodeler/pmpovrayparser.cpp	(revision 484288)
++++ kpovmodeler/pmpovrayparser.cpp	(revision 490050)
+@@ -3876,7 +3876,7 @@
+             nextToken( );
+             pattern->setPatternType( PMPattern::PatternJulia );
+             type = true;
+-            if( !parseVector( vector ) );
++            if( !parseVector( vector ) )
+                return false;
+             pattern->setJuliaComplex( vector );
+             if( !parseInt( i_number ) )
+--- kpovmodeler/pmobjectsettings.cpp	(revision 484288)
++++ kpovmodeler/pmobjectsettings.cpp	(revision 490050)
+@@ -538,7 +538,7 @@
+       PMSphereSweep::setSSteps( m_pSphereSweepSSteps->value( ) );
+       repaint = true;
+    }
+-   if( PMHeightField::variance( ) != m_pHeightFieldVariance->value( ) );
++   if( PMHeightField::variance( ) != m_pHeightFieldVariance->value( ) )
+    {
+       PMHeightField::setVariance( m_pHeightFieldVariance->value( ) );
+       repaint = true;
+--- kpovmodeler/kpovmodeler.desktop	(revision 484288)
++++ kpovmodeler/kpovmodeler.desktop	(revision 490050)
+@@ -9,7 +9,6 @@
+ Name[nb]=KPov-modellerer
+ Name[nn]=KPov-modellering
+ Name[sv]=Kpovmodeler
+-Name[xx]=xxKPovModelerxx
+ GenericName=Povray Modeler
+ GenericName[ca]=Modelador Povray
+ GenericName[cs]=Modelář Povray
+@@ -40,7 +39,6 @@
+ GenericName[sv]=Modellering med Povray
+ GenericName[ta]=பாவ்ரே மாடுல்லர்
+ GenericName[tr]=Povray Modelleyici
+-GenericName[xx]=xxPovray Modelerxx
+ GenericName[zh_CN]=Povray 建模器
+ Path=
+ ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart,Browser/View,KPovModeler/Document
+--- kgamma/kcmkgamma/kgamma.desktop	(revision 484288)
++++ kgamma/kcmkgamma/kgamma.desktop	(revision 490050)
+@@ -37,13 +37,13 @@
+ Comment[tg]=Утилита барои калибратсия кардани монитор
+ Comment[tr]=Monitör kalibrasyon aracı
+ Comment[uk]=Засіб для калібрування монітора
+-Comment[xx]=xxA monitor calibration toolxx
+ Comment[zh_CN]=监视器校准工具
+ 
+ Name=Gamma
+ Name[ar]=غاما
+ Name[az]=Qamma
+ Name[bg]=Гама
++Name[cs]=Gama
+ Name[cy]=Gama
+ Name[el]=Γάμμα
+ Name[eo]=Gamo
+@@ -63,14 +63,13 @@
+ Name[uk]=Гама
+ Name[uz]=Гамма
+ Name[xh]=Unobumba wesithathu konoobumba besiGrike
+-Name[xx]=xxGammaxx
+ 
+ DocPath=kgamma
+ Exec=kcmshell kgamma
+ Icon=kgamma
+ Keywords=KGamma, kgamma, Gamma, gamma
+ Keywords[bg]=калибриране, гама, яркост, цвят, монитор, екран, KGamma, kgamma, Gamma, gamma
+-Keywords[cs]=KGamma, kgamma, gamma
++Keywords[cs]=KGamma, kgamma, gama
+ Keywords[de]=KGamma,kgamma,Gamma,gamma
+ Keywords[el]=KGamma, kgamma, Γάμμα, γάμμα
+ Keywords[ga]=KGamma, kgamma, Gamma, gamma, Gáma
+@@ -96,7 +95,6 @@
+ Keywords[uk]=KGamma, kgamma, Gamma, gamma, гама, яскравість
+ Keywords[uz]=KGamma, kgamma, Гамма, гамма
+ Keywords[wa]=KGamma, kgamma, Gama, gama
+-Keywords[xx]=xxKGamma, kgamma, Gamma, gammaxx
+ Keywords[zh_CN]=KGamma, kgamma, Gamma, gamma,伽玛
+ Type=Application
+ X-KDE-Init=kgamma
+--- kdvi/kdvi_multipage.cpp	(revision 484288)
++++ kdvi/kdvi_multipage.cpp	(revision 490050)
+@@ -77,7 +77,6 @@
+ 
+   setXMLFile("kdvi_part.rc");
+ 
+-  readSettings();
+   preferencesChanged();
+ 
+   enableActions(false);
+@@ -93,7 +92,6 @@
+   delete exportPSAction;
+   delete exportPDFAction;
+ 
+-  writeSettings();
+   Prefs::writeConfig();
+ }
+ 
+--- kdvi/special.cpp	(revision 484288)
++++ kdvi/special.cpp	(revision 490050)
+@@ -326,17 +326,17 @@
+   // course, this does not work if the filename contains spaces
+   // (already the simplifyWhiteSpace() above is wrong). If you have
+   // files like this, go away.
+-  QString EPSfilename = include_command;
+-  EPSfilename.truncate(EPSfilename.find(' '));
++  QString EPSfilename_orig = include_command;
++  EPSfilename_orig.truncate(EPSfilename_orig.find(' '));
+ 
+   // Strip enclosing quotation marks which are included by some LaTeX
+   // macro packages (but not by others). This probably means that
+   // graphic files are no longer found if the filename really does
+   // contain quotes, but we don't really care that much.
+-  if ((EPSfilename.at(0) == '\"') && (EPSfilename.at(EPSfilename.length()-1) == '\"')) {
+-    EPSfilename = EPSfilename.mid(1,EPSfilename.length()-2);
++  if ((EPSfilename_orig.at(0) == '\"') && (EPSfilename_orig.at(EPSfilename_orig.length()-1) == '\"')) {
++    EPSfilename_orig = EPSfilename_orig.mid(1,EPSfilename_orig.length()-2);
+   }
+-  EPSfilename = ghostscript_interface::locateEPSfile(EPSfilename, baseURL);
++  QString EPSfilename = ghostscript_interface::locateEPSfile(EPSfilename_orig, baseURL);
+   
+   // Now parse the arguments. 
+   int  llx     = 0; 
+@@ -425,11 +425,14 @@
+       foreGroundPainter->setBrush(Qt::red);
+     foreGroundPainter->setPen(Qt::black);
+     foreGroundPainter->drawRoundRect(bbox, 2, 2);
++    QFont f = foreGroundPainter->font();
++    f.setPointSize(8);
++    foreGroundPainter->setFont(f);
+     if (QFile::exists(EPSfilename))
+-      foreGroundPainter->drawText (bbox, (int)(Qt::AlignCenter), EPSfilename, -1);
++      foreGroundPainter->drawText (bbox, (int)(Qt::AlignCenter), EPSfilename_orig, -1);
+     else
+       foreGroundPainter->drawText (bbox, (int)(Qt::AlignCenter), 
+-				i18n("File not found: \n %1").arg(EPSfilename), -1);
++				i18n("File not found: \n %1").arg(EPSfilename_orig), -1);
+     foreGroundPainter->restore();
+   }
+   
+--- kdvi/kdvi.desktop	(revision 484288)
++++ kdvi/kdvi.desktop	(revision 490050)
+@@ -59,7 +59,6 @@
+ GenericName[ven]=Muvhoni wa DVI
+ GenericName[wa]=Håyneu di fitchîs DVI
+ GenericName[xh]=Umboniseli we DVI
+-GenericName[xx]=xxDVI Viewerxx
+ GenericName[zh_CN]=DVI 查看器
+ GenericName[zh_TW]=DVI 檢視器
+ GenericName[zu]=Umboniseli we DVI
+@@ -68,7 +67,6 @@
+ Name[ar]=برنامج KDVI
+ Name[eo]=DVI-rigardilo
+ Name[hi]=के-डीवीआई
+-Name[xx]=xxKDVIxx
+ MimeType=application/x-dvi;application/x-gzdvi;application/x-bz2dvi;
+ InitialPreference=6
+ Exec=kdvi %f -caption "%c" %i %m
+--- kdvi/kdvimultipage.desktop	(revision 484288)
++++ kdvi/kdvimultipage.desktop	(revision 490050)
+@@ -1,7 +1,6 @@
+ [Desktop Entry]
+ Type=Service
+ Comment=DVI
+-Comment[xx]=xxDVIxx
+ Name=KDVIMultiPage
+ Name[es]=KDVIMultiPágina
+ Name[fr]=Multi-page KDVI
+@@ -12,7 +11,6 @@
+ Name[pt]=KDVIMultiPágina
+ Name[ro]=KDVI Pagini Multiple
+ Name[sv]=KDVI flera sidor
+-Name[xx]=xxKDVIMultiPagexx
+ ServiceTypes=KViewShell/MultiPage
+ X-KDE-Library=kdvipart
+ X-KDE-MimeTypes=application/x-dvi
+--- kdvi/fontpool.cpp	(revision 484288)
++++ kdvi/fontpool.cpp	(revision 490050)
+@@ -422,7 +422,7 @@
+ 	matchingFiles = fileNameList.grep(fn);
+ #endif
+       if (matchingFiles.isEmpty() == true)
+-	matchingFiles += fileNameList.grep(fontp->fontname);
++	matchingFiles += fileNameList.grep(fontp->fontname+".");
+       
+       if (matchingFiles.isEmpty() != true) {
+ #ifdef DEBUG_FONTPOOL
+--- kdvi/psgs.cpp	(revision 484288)
++++ kdvi/psgs.cpp	(revision 490050)
+@@ -329,11 +329,11 @@
+   
+   // Otherwise, use kpsewhich to find the eps file.
+   QString EPSfilename;
+-
+   KProcIO proc;
+-  proc << "kpsewhich" << EPSfilename;
++  proc << "kpsewhich" << filename;
+   proc.start(KProcess::Block);
+   proc.readln(EPSfilename);
++
+   return EPSfilename.stripWhiteSpace();
+ }
+ 
+--- kcoloredit/kcoloredit.desktop	(revision 484288)
++++ kcoloredit/kcoloredit.desktop	(revision 490050)
+@@ -59,7 +59,6 @@
+ GenericName[uk]=Редактор палітри кольорів
+ GenericName[ven]=Musengulusi wa phalete ya muvhala
+ GenericName[wa]=Aspougneu del palete di coleurs
+-GenericName[xx]=xxColor Palette Editorxx
+ GenericName[zh_CN]=调色板编辑器
+ GenericName[zh_TW]=調色板編輯器
+ GenericName[zu]=Umhleli Wombala we Palette
+@@ -83,7 +82,6 @@
+ Name[tr]=K Renk Düzenleyici
+ Name[ven]=U sengulusa muvhala ha K
+ Name[xh]=Umhleli Wombala ye K
+-Name[xx]=xxKColorEditxx
+ Name[zh_TW]=顏色編輯程式
+ Name[zu]=Umhleli Wombala ka K
+ 
+--- kcoloredit/kcolorchooser.desktop	(revision 484288)
++++ kcoloredit/kcolorchooser.desktop	(revision 490050)
+@@ -61,7 +61,6 @@
+ GenericName[ven]=Munangi wa Muvhala
+ GenericName[wa]=Tchoezixheu di coleurs
+ GenericName[xh]=Mkhethi Wombala
+-GenericName[xx]=xxColor Chooserxx
+ GenericName[zh_CN]=颜色选择程序
+ GenericName[zh_TW]=顏色選擇程式
+ GenericName[zu]=Umkhethi Wombala
+@@ -93,7 +92,6 @@
+ Name[uz]=Ранг танловчи
+ Name[ven]=Tshinangi tsha muvhala tsha K
+ Name[xh]=Umkhethi Wombala i K
+-Name[xx]=xxKColorChooserxx
+ Name[zh_TW]=顏色選擇程式
+ Name[zu]=Umkhethi Wombala ka K
+ 
+--- kooka/kooka.desktop	(revision 484288)
++++ kooka/kooka.desktop	(revision 490050)
+@@ -54,7 +54,6 @@
+ GenericName[ven]=U nanga & Mbekanyamushumo ya OCR
+ GenericName[wa]=Programe di scanaedje eyet di ricnoxhance di tecse
+ GenericName[xh]=Udweliso Lwenkqubo Yemita Yovavanyo
+-GenericName[xx]=xxScan & OCR Programxx
+ GenericName[zh_CN]=扫描和文字识别程序
+ GenericName[zh_TW]=掃描和文字辦識程式
+ GenericName[zu]=Scan & OCR Iprogremu
+@@ -66,7 +65,6 @@
+ Name[ko]=쿠카
+ Name[pa]=ਕੋਕਾ
+ Name[ta]=கூக்கா
+-Name[xx]=xxKookaxx
+ 
+ X-DCOP-ServiceType=Multi
+ Categories=Qt;KDE;Graphics;
+--- doc/kcoloredit/index.docbook	(revision 484288)
++++ doc/kcoloredit/index.docbook	(revision 490050)
+@@ -16,7 +16,7 @@
+ <firstname>Artur</firstname>
+ <surname>Rataj</surname>
+ <affiliation>
+-<address><email>art at zeus.polsl.gliwice.pl</email></address>
++<address>&Artur.Rataj.mail;</address>
+ </affiliation>
+ </author>
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+@@ -25,13 +25,13 @@
+ 
+ <copyright>
+ <year>2000</year>
+-<holder>Artur Rataj</holder>
++<holder>&Artur.Rataj;</holder>
+ </copyright>
+ 
+ <legalnotice>&FDLNotice;</legalnotice>
+ 
+-<date>2002-01-09</date>
+-<releaseinfo>2.91.00</releaseinfo>
++<date>2005-12-10</date>
++<releaseinfo>3.5.0</releaseinfo>
+ 
+ <abstract>
+ <para>&kcoloredit; is a palette files editor. It can be used for editing
+@@ -109,13 +109,13 @@
+ </para>
+ </listitem>
+ <listitem>
+-<para>If the <guilabel>After cursor</guilabel> check-box near to the
+-<guilabel>Add a Color</guilabel> button is checked, a color from the
+-color chooser is put after the cursor.  The color is either inserted
++<para>If the <guilabel>At cursor</guilabel> check-box near the
++<guilabel>Add Color</guilabel> button is checked, a color from the
++color chooser is put at the cursor.  The color is either inserted
+ or it overwrites another one, depending on whether the
+ <guilabel>Overwrite</guilabel> mode is chosen. The mode can be chosen
+ by checking the <guilabel>Overwrite</guilabel> check-box, that is next
+-to the <guilabel>After Cursor</guilabel> one.</para>
++to the <guilabel>At cursor</guilabel> one.</para>
+ </listitem>
+ </itemizedlist>
+ 
+@@ -159,15 +159,15 @@
+ By selecting a color from color gradient panels. In the left one, two
+ from HSV components can be selected, and in the right one, the third
+ one. The third component can be chosen by clicking on one of the
+-buttons labeled <guilabel>H</guilabel>, <guilabel>S</guilabel> and
+-<guilabel>V</guilabel>. The one component panel display colors with
++buttons labeled <guilabel>H:</guilabel>, <guilabel>S:</guilabel> and
++<guilabel>V:</guilabel>. The one component panel display colors with
+ the other two components equal to these selected in the two components
+ panel.  The two components panel may display colors with the third
+ component fixed, or, if the <guilabel>Variable</guilabel> check-box is
+ set, with a value equal to the one selected in the one component
+ panel. In the <guilabel>Replace</guilabel> mode, the color selected in
+ panels replaces the output one instantly, and in the
+-<guilabel>Change</guilabel> mode it modifies the output color after
++<guilabel>Change:</guilabel> mode it modifies the output color after
+ each click, or a mouse move while a mouse button is
+ pressed. Therefore, in the latter mode the color selected in the
+ gradient panels may be different from the output color. To synchronize
+@@ -198,24 +198,23 @@
+ <variablelist>
+ <varlistentry>
+ <term><menuchoice>
++<shortcut><keycombo action="simul">&Ctrl;
++<keycap>N</keycap></keycombo></shortcut>
+ <guimenu>File</guimenu>
+-<guimenuitem>New Window</guimenuitem>
++<guimenuitem>New</guimenuitem>
+ </menuchoice></term>
+ <listitem>
+-<para><action>Open a new window</action></para>
++<para><action>Start a new palette in the current window.</action></para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+ <term><menuchoice>
+-<shortcut><keycombo action="simul">&Ctrl;
+-<keycap>N</keycap></keycombo></shortcut>
+ <guimenu>File</guimenu>
+-<guimenuitem>New</guimenuitem>
++<guimenuitem>New Window</guimenuitem>
+ </menuchoice></term>
+ <listitem>
+-<para><action>Start a new palette in the current
+-window.</action></para>
++<para><action>Open a new window</action></para>
+ </listitem>
+ </varlistentry>
+ 
+@@ -245,36 +244,35 @@
+ <varlistentry>
+ <term><menuchoice>
+ <shortcut><keycombo action="simul">&Ctrl;
+-<keycap>W</keycap></keycombo></shortcut>
++<keycap>S</keycap></keycombo></shortcut>
+ <guimenu>File</guimenu>
+-<guimenuitem>Close</guimenuitem>
++<guimenuitem>Save</guimenuitem>
+ </menuchoice></term>
+ <listitem>
+-<para><action>Close</action> the current &kcoloredit;
+-window.</para>
++<para><action>Save the currently open palette.</action></para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+ <term><menuchoice>
+-<shortcut><keycombo action="simul">&Ctrl;
+-<keycap>S</keycap></keycombo></shortcut>
+ <guimenu>File</guimenu>
+-<guimenuitem>Save</guimenuitem>
++<guimenuitem>Save As...</guimenuitem>
+ </menuchoice></term>
+ <listitem>
+-<para><action>Save the currently open palette.</action></para>
++<para><action>Save the currently open palette with a new
++name.</action></para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+ <term><menuchoice>
++<shortcut><keycombo action="simul">&Ctrl;
++<keycap>W</keycap></keycombo></shortcut>
+ <guimenu>File</guimenu>
+-<guimenuitem>Save As...</guimenuitem>
++<guimenuitem>Close</guimenuitem>
+ </menuchoice></term>
+ <listitem>
+-<para><action>Save the currently open palette with a new
+-name.</action></para>
++<para><action>Close</action> the current &kcoloredit; window</para>
+ </listitem>
+ </varlistentry>
+ 
+@@ -367,40 +365,63 @@
+ 
+ </sect1>
+ 
+-<sect1 id="view-menu">
+-<title>The <guimenu>View</guimenu> Menu</title>
++<sect1 id="settings-menu">
++<title>The <guimenu>Settings</guimenu> Menu</title>
+ 
+ <variablelist>
+ <varlistentry>
+ <term><menuchoice>
+-<guimenu>Color</guimenu>
+-<guimenuitem>Color Names</guimenuitem>
++<guimenu>Settings</guimenu>
++<guimenuitem>Hide/Show Toolbar</guimenuitem>
+ </menuchoice></term>
+ <listitem>
+-<para>If the currently open palette has color names, <action>display
++<para><action>Toggle on and off the toolbar icons.</action></para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<guimenu>Settings</guimenu>
++<guimenuitem>Hide/Show Statusbar</guimenuitem>
++</menuchoice></term>
++<listitem>
++<para><action>Toggle on and off the status bar.</action></para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<guimenu>Settings</guimenu>
++<guimenuitem>Hide/Show Color Names</guimenuitem>
++</menuchoice></term>
++<listitem>
++<para>If the currently open palette has color name, <action>display
+ them alongside the colors</action>.</para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+ <term><menuchoice>
+-<guimenu>View</guimenu>
+-<guimenuitem>Toolbar</guimenuitem>
++<guimenu>Settings</guimenu>
++<guimenuitem>Configure Shortcuts...</guimenuitem>
+ </menuchoice></term>
+ <listitem>
+-<para><action>Toggle on and off the toolbar icons.</action></para>
++<para><action>Configure</action> the keyboard keys you use to access the 
++different actions.</para>
+ </listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+ <term><menuchoice>
+-<guimenu>View</guimenu>
+-<guimenuitem>Statusbar</guimenuitem>
++<guimenu>Settings</guimenu>
++<guimenuitem>Configure Toolbars...</guimenuitem>
+ </menuchoice></term>
+ <listitem>
+-<para><action>Toggle on and off the status bar.</action></para>
++<para><action>Configure</action> the items you want to put in the toolbar
++</para>
+ </listitem>
+ </varlistentry>
++
+ </variablelist>
+ 
+ </sect1>
+@@ -417,9 +438,9 @@
+ <chapter id="credits-and-licenses">
+ <title>Credits and Licenses</title>
+ 
+-<para>&kcoloredit; copyright 2000 Artur Rataj</para>
++<para>&kcoloredit; copyright 2000 &Artur.Rataj;</para>
+ 
+-<para>Documentation copyright 2000 Artur Rataj</para>
++<para>Documentation copyright 2000 &Artur.Rataj;</para>
+ 
+ <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
+ 
+--- doc/kpdf/index.docbook	(revision 484288)
++++ doc/kpdf/index.docbook	(revision 490050)
+@@ -13,17 +13,23 @@
+ 		<authorgroup>
+ 			<author>
+ 				<firstname>Albert</firstname>
+-				<othername></othername>
+ 				<surname>Astals Cid</surname>
+ 				<affiliation>
+ 					<address><email>tsdgeos at yahoo.es</email></address>
+ 				</affiliation>
+ 			</author>
++			<author>
++				<firstname>Titus</firstname>
++				<surname>Laska</surname>
++				<affiliation>
++					<address><email>titus.laska at gmx.de</email></address>
++				</affiliation>
++			</author>
+ 			<!-- TRANS:ROLES_OF_TRANSLATORS -->
+ 		</authorgroup>
+ 		<legalnotice>&FDLNotice;</legalnotice>
+-		<date>2005-02-20</date>
+-		<releaseinfo>1.0</releaseinfo>
++		<date>2005-12-10</date>
++		<releaseinfo>0.5</releaseinfo>
+ 		<!-- Abstract about this handbook -->
+ 		<abstract>
+ 			<para>&kpdf; is a &kde; PDF viewer based on xpdf code.</para>
+@@ -36,84 +42,156 @@
+ 	</bookinfo>
+ 	<chapter id="introduction">
+ 		<title>Introduction</title>
+-		<para>&kpdf; is a &kde; PDF viewer based on xpdf code. Although being
+-			based on xpdf code, &kpdf; has some unique features like continuous
+-			mode, presentation support, etc.</para>
+-	</chapter>
+-	<chapter id="navigating">
+-		<title>Navigating</title>
+-		<para>This section describes how you can navigate a document in &kpdf;.</para>
+-		<para>
+-			You can scroll up and down the viewing area with the 
+-			<keycap>Up Arrow</keycap> and <keycap>Down Arrow</keycap>	keys, using the 
+-			mouse wheel, pressing &LMB;	and dragging while in normal mode or using 
+-			<keycap>Page Up</keycap> and <keycap>Page Down</keycap> keys.
++		<para>&kpdf; is a &kde; <firstterm>PDF</firstterm> (Portable Document Format) viewer
++			based on the code of the xpdf application. Although being based on xpdf code, &kpdf;
++			has some unique features such as continuous mode and presentation support.
+ 		</para>
+ 		<para>
+-			If you click on a page thumbnail the viewing area will be brought to
+-			that page.
++			The PDF format is widely used for publishing documents that are
++			mostly not meant to be edited again. &kpdf; is only a viewer
++			for these files and therefore it doesn't provide any functionality
++			to edit or create PDF documents.
+ 		</para>
+-		<para>
+-			If the document has a table of contents, clicking on a table
+-			of contents item will bring the document to to the page linked to that
+-			item.
+-		</para>
+-		<para>
+-			If the document has links in it, you can click on them and the view will
+-			change to the page it links to. If the link is to a web page the default
+-			browser will be invoked.
+-		</para>
+-		<para>
+-			You can go to the first page of the document using 
+-			<keycombo action="simul">&Ctrl;<keycap>Home</keycap></keycombo> or
+-			using 
+-			<menuchoice>
+-				<guimenu>Go</guimenu>
+-				<guimenuitem>First Page</guimenuitem>
+-			</menuchoice>.
+-		</para>
+-		<para>
+-			You can go to the last page of the document using 
+-			<keycombo action="simul">&Ctrl;<keycap>End</keycap></keycombo> or
+-			using 
+-			<menuchoice>
+-				<guimenu>Go</guimenu>
+-				<guimenuitem>Last Page</guimenuitem>
+-			</menuchoice>.
+-		</para>
+-		<para>
+-			You can go to the next page of the document using 
+-			<keycap>Space</keycap>, the <guibutton>Next Page</guibutton> Toolbar
+-			button or	using 
+-			<menuchoice>
+-				<guimenu>Go</guimenu>
+-				<guimenuitem>Next Page</guimenuitem>
+-			</menuchoice>.
+-		</para>
+-		<para>
+-			You can go to the previous page of the document using 
+-			<keycap>Backspace</keycap>, the <guibutton>Previous Page</guibutton> Toolbar
+-			button or	using 
+-			<menuchoice>
+-				<guimenu>Go</guimenu>
+-				<guimenuitem>Previous Page</guimenuitem>
+-			</menuchoice>.
+-		</para>
+ 	</chapter>
+-	<chapter id="presentationMode">
+-		<title>Presentation Mode</title>
+-		<para>
+-			Presentation mode can be enabled in
+-			<menuchoice><guimenu>View</guimenu><guimenuitem>Presentation</guimenuitem></menuchoice>.
+-			It shows the document in a page per page basis. The pages are shown with
+-			zoom to page, that means all the page is visible. To navigate between
+-			pages you have to use &LMB; (next page) and &RMB; (previous page). You
+-			can exit presentation mode using <keycap>ESC</keycap> key.
+-		</para>
+-		<para>
+-			Presentation mode has a few configuration options, you can find their
+-			meaning at <link linkend="configuring">Configuring &kpdf;</link>
+-		</para>
++	<chapter id="use">
++		<title>Using &kpdf;</title>
++		<sect1 id="opening">
++			<title>Opening Files</title>
++			<para>
++				To view a PDF file in &kpdf;, select <menuchoice><guimenu>File</guimenu><guimenuitem>Open...
++				</guimenuitem></menuchoice>, choose a file in the dialogue and click <guibutton>Open</guibutton>.
++				As long as you selected a valid PDF file, your file should know be displayed in the main window.
++			</para>
++			<para>
++				If you have already opened files in &kpdf; before, you can quickly access them by selecting them in
++				the <menuchoice><guimenu>File</guimenu><guisubmenu>Open Recent</guisubmenu></menuchoice> menu.
++			</para>
++			<para>
++				After having a file opened you probably want to read it and therefore navigate through it. Click
++				Next to learn more about this.
++			</para>
++		</sect1>
++		<sect1 id="navigating">
++			<title>Navigating</title>
++			<para>This section describes how you can navigate through a document in &kpdf;.</para>
++			<para>
++				There are multiple ways of scrolling the viewing area. One is to use the 
++				<keycap>Up Arrow</keycap> and <keycap>Down Arrow</keycap> keys. You may also use
++				the scrollbar, your <!--TODO: insert entity, if any-->mousewheel or the <keycap>Page Up</keycap> and <keycap>Page Down</keycap>
++				keys.
++			</para>
++			<para>
++				Another way is to hold the &LMB; down at any place on the document while dragging the mouse in the
++				opposite direction of where you want to move. This procedure only works if the Browse Tool is
++				enabled, which you can select by choosing <menuchoice><guimenu>Tools</guimenu><guimenuitem>Browse Tool
++				</guimenuitem></menuchoice>.
++			</para>
++			<para>
++				The navigation panel on the left side of the screen enables two more ways of navigating
++				through a document:
++			</para>
++			<itemizedlist>
++				<listitem>
++					<para>
++						If you click on a page thumbnail the viewing area will be brought to
++						that page.
++					</para>
++				</listitem>
++				<listitem>
++					<para>
++						If the document has a table of contents, clicking on a table
++						of contents item will bring the document to to the page linked to that
++						item.
++					</para>
++				</listitem>
++			</itemizedlist>
++			<para>
++				Some documents have links. In this case you can click on them and the view will
++				change to the page it links to. If the link is to a web page the default
++				browser will be invoked.
++			</para>
++			<para>
++				Additionally, you may use the following functionality to quickly move to specific places
++				in the document:
++			</para>
++			<itemizedlist>
++				<listitem>
++					<para>
++						You can go to the first page of the document using 
++						<keycombo action="simul">&Ctrl;<keycap>Home</keycap></keycombo> or
++						using 
++						<menuchoice>
++							<guimenu>Go</guimenu>
++							<guimenuitem>First Page</guimenuitem>
++						</menuchoice>.
++					</para>
++				</listitem>
++				<listitem>
++					<para>
++						You can go to the last page of the document using 
++						<keycombo action="simul">&Ctrl;<keycap>End</keycap></keycombo> or
++						using 
++						<menuchoice>
++							<guimenu>Go</guimenu>
++							<guimenuitem>Last Page</guimenuitem>
++						</menuchoice>.
++					</para>
++				</listitem>
++				<listitem>
++					<para>
++						You can go to the next page of the document using 
++						<keycap>Space</keycap>, the <guibutton>Next Page</guibutton> Toolbar
++						button or	using 
++						<menuchoice>
++							<guimenu>Go</guimenu>
++							<guimenuitem>Next Page</guimenuitem>
++						</menuchoice>.
++					</para>
++				</listitem>
++				<listitem>
++					<para>
++						You can go to the previous page of the document using 
++						<keycap>Backspace</keycap>, the <guibutton>Previous Page</guibutton> Toolbar
++						button or	using 
++						<menuchoice>
++							<guimenu>Go</guimenu>
++							<guimenuitem>Previous Page</guimenuitem>
++						</menuchoice>.
++					</para>
++				</listitem>
++			</itemizedlist>
++		</sect1>
++		<sect1 id="presentationMode">
++			<title>Presentation Mode</title>
++			<para>
++				The Presentation mode represents another way to view PDF documents in &kpdf;. It can be
++				enabled in
++				<menuchoice><guimenu>View</guimenu><guimenuitem>Presentation</guimenuitem></menuchoice>.
++				It shows the document on a page per page basis. The pages are shown with
++				zoom to page, that means all the page is visible. 
++			</para>
++			<note>
++				<para>
++					PDF documents can even specify that they are always opened in presentation mode.
++				</para>
++			</note>
++			<para>
++				To navigate between
++				pages you may use the &LMB; (next page) and the &RMB; (previous page), the mouse
++				wheel, the arrow icons that appear as soon as you move the mouse to the top of the screen,
++				or the keys specified in the <link linkend="navigating">Navigating</link>
++				section. 
++			</para>
++			<para>
++				You can exit presentation mode at any time by pressing the <keycap>ESC</keycap> key or clicking
++				the <guiicon>Quit</guiicon> icon appearing if you move the mouse to the top of the 
++				screen.
++			</para>
++			<para>
++				Presentation mode has some configuration options, you can find their
++				description at <link linkend="configpresentation">Configuring &kpdf;</link>.
++			</para>
++		</sect1>
+ 	</chapter>
+ 			
+ 	<chapter id="primary-menu-items">
+@@ -134,7 +212,8 @@
+ 					</term>
+ 					<listitem>
+ 						<para>
+-							<action>Open</action> a file. If a file	is currently being displayed it will be closed.
++							<action>Open</action> a PDF file. If there is already an opened file it will be closed.
++							For more information, see the section about <link linkend="opening">Opening Files</link>.
+ 						</para>
+ 					</listitem>
+ 				</varlistentry>
+@@ -148,9 +227,10 @@
+ 					</term>
+ 					<listitem>
+ 						<para>
+-							<action>Open</action> a file selected from a drop-down list of
+-							recently opened files. If a file is currently being displayed it
+-							will be	closed.
++							<action>Open</action> a file which was used previously from a
++							submenu. If a file is currently being displayed it
++							will be	closed. For more information, see the section about 
++							<link linkend="opening">Opening Files</link>.
+ 						</para>
+ 					</listitem>
+ 				</varlistentry>
+@@ -163,7 +243,7 @@
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+-						<para><action>Save</action> the currently open file.</para>
++						<para><action>Save</action> the currently open file under a different name.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 
+@@ -191,8 +271,8 @@
+ 					</term>
+ 					<listitem>
+ 						<para>
+-							<action>Shows</action> a preview of how the currently displayed
+-							document will print with the default options.
++							<action>Show a preview</action> of how the currently displayed
++							document would be printed with the default options.
+ 						</para>
+ 					</listitem>
+ 				</varlistentry>
+@@ -205,7 +285,8 @@
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+-						<para><action>Display</action> some basic information about	the document.</para>
++						<para><action>Display some basic information</action> about the document, such as
++							title, author, creation date, and details about the fonts used.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 
+@@ -236,7 +317,8 @@
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+-						<para><action>Finds</action> a string in the document text.</para>
++						<para>Open a dialogue that allows you to <action>search for a string in
++							the document</action>.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 
+@@ -249,64 +331,26 @@
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+-						<para><action>Finds</action> the previous searched string again.</para>
++						<para>Try to <action>find the previous searched string again</action> in the document.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 			</variablelist>
+ 		</sect1>
+ 		
+-		<sect1 id="menumoude">
+-			<title>The <guimenu>Mouse mode</guimenu> Menu</title>
+-			<variablelist>
+-				<varlistentry>
+-					<term>
+-						<menuchoice>
+-							<guimenu>Mouse mode</guimenu>
+-							<guimenuitem>Normal</guimenuitem>
+-						</menuchoice>
+-					</term>
+-					<listitem>
+-						<para>The mouse will have its normal behaviour, &LMB; for dragging the document and following links and &RMB; for adding bookmarks and fit to width.</para>
+-					</listitem>
+-				</varlistentry>
+-				<varlistentry>
+-					<term>
+-						<menuchoice>
+-							<guimenu>Mouse mode</guimenu>
+-							<guimenuitem>Zoom tool</guimenuitem>
+-						</menuchoice>
+-					</term>
+-					<listitem>
+-						<para>The mouse will work as a zoom tool. Clicking &LMB; and dragging will zoom the view to the selected area, clicking &RMB; will bring the document back to the previous zoom.</para>
+-					</listitem>
+-				</varlistentry>
+-				<varlistentry>
+-					<term>
+-						<menuchoice>
+-							<guimenu>Mouse mode</guimenu>
+-							<guimenuitem>Select</guimenuitem>
+-						</menuchoice>
+-					</term>
+-					<listitem>
+-						<para>The mouse will work as a select tool. In that mode clicking &LMB; and dragging will give the option of copying the text/image of current the selected area to the clipboard, images can be saved to a file too.</para>
+-					</listitem>
+-				</varlistentry>
+-			</variablelist>
+-		</sect1>
+-
+ 		<sect1 id="menuview">
+ 			<title>The <guimenu>View</guimenu> Menu</title>
+ 			<variablelist>
+ 				<varlistentry>
+ 					<term>
+ 						<menuchoice>
++							<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>P</keycap></keycombo></shortcut>
+ 							<guimenu>View</guimenu>
+ 							<guimenuitem>Presentation</guimenuitem>
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+-						<para><action>Activates</action> the <link
+-								linkend="presentationMode">presentation mode</link>.</para>
++						<para><action>Activates</action> the Presentation Mode. For more information, see the
++							section about <link linkend="presentationMode">Presentation Mode</link>.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 				<varlistentry>
+@@ -342,8 +386,9 @@
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+-						<para><action>Changes the magnification</action> of the document
+-							view so that the pages width fill all the view space.</para>
++						<para><action>Change the magnification</action> of the document
++							view to a value that makes the pages' width equal to the document
++							view's width.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 				<varlistentry>
+@@ -354,8 +399,8 @@
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+-						<para><action>Changes the magnification</action> of the document view
+-							so that the pages fits completely on the view space.</para>
++						<para><action>Change the magnification</action> of the document view
++							to a value that makes at least one whole page visible.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 				<varlistentry>
+@@ -366,7 +411,12 @@
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+-						<para><action>Enables</action> the continuous page mode.</para>
++						<para><action>Enable the continuous page mode</action>. In continuos mode,
++							all pages of the document are shown, and you can scroll through
++							them without having to use the <menuchoice><guimenu>Go</guimenu>
++							<guimenuitem>Previous Page</guimenuitem></menuchoice> and
++							<menuchoice><guimenu>Go</guimenu><guimenuitem>Next Page</guimenuitem>
++							</menuchoice> options.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 				<varlistentry>
+@@ -377,7 +427,8 @@
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+-						<para><action>Enables</action> the two page mode.</para>
++						<para><action>Enable the two page mode</action>, which shows two pages of
++							the document next to each other..</para>
+ 					</listitem>
+ 				</varlistentry>
+ 			</variablelist>
+@@ -389,6 +440,30 @@
+ 				<varlistentry>
+ 					<term>
+ 						<menuchoice>
++							<shortcut><keycap>Backspace</keycap></shortcut>
++							<guimenu>Go</guimenu>
++							<guimenuitem>Previous Page</guimenuitem>
++						</menuchoice>
++					</term>
++					<listitem>
++						<para><action>View the previous page</action> of the document.</para>
++					</listitem>
++				</varlistentry>
++				<varlistentry>
++					<term>
++						<menuchoice>
++							<shortcut><keycap>Space</keycap></shortcut>
++							<guimenu>Go</guimenu>
++							<guimenuitem>Next Page</guimenuitem>
++						</menuchoice>
++					</term>
++					<listitem>
++						<para><action>View the next page</action> of the document.</para>
++					</listitem>
++				</varlistentry>
++				<varlistentry>
++					<term>
++						<menuchoice>
+ 							<shortcut><keycombo action="simul">&Ctrl; <keycap>Home</keycap></keycombo></shortcut>
+ 							<guimenu>Go</guimenu>
+ 							<guimenuitem>First Page</guimenuitem>
+@@ -401,50 +476,102 @@
+ 				<varlistentry>
+ 					<term>
+ 						<menuchoice>
+-							<shortcut><keycap>Backspace</keycap></shortcut>
++							<shortcut><keycombo action="simul">&Ctrl;	<keycap>End</keycap></keycombo></shortcut>
+ 							<guimenu>Go</guimenu>
+-							<guimenuitem>Previous Page</guimenuitem>
++							<guimenuitem>Last Page</guimenuitem>
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+-						<para>View the <action>previous page</action> of the document.</para>
++						<para><action>Go to the last page</action> of the document.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 				<varlistentry>
+ 					<term>
+ 						<menuchoice>
+-							<shortcut><keycap>Space</keycap></shortcut>
++							<shortcut><keycombo action="simul">&Alt;	<keycap>Left</keycap></keycombo></shortcut>
+ 							<guimenu>Go</guimenu>
+-							<guimenuitem>Next Page</guimenuitem>
++							<guimenuitem>Back</guimenuitem>
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+-						<para>View the <action>next page</action> of the document.</para>
+-		 			</listitem>
++						<para><action>Go back to the previous view</action> of the document.</para>
++					</listitem>
+ 				</varlistentry>
+ 				<varlistentry>
+ 					<term>
+ 						<menuchoice>
+-							<shortcut><keycombo action="simul">&Ctrl;	<keycap>End</keycap></keycombo></shortcut>
++							<shortcut><keycombo action="simul">&Alt;<keycap>Right</keycap></keycombo></shortcut>
+ 							<guimenu>Go</guimenu>
+-							<guimenuitem>Last Page</guimenuitem>
++							<guimenuitem>Forward</guimenuitem>
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+-						<para><action>Go to the last page</action> of the document.</para>
++						<para><action>Move forward to the next view</action> of the document. This only works if you have already moved back before.</para>
+ 					</listitem>
+ 				</varlistentry>
++				<varlistentry>
++					<term>
++						<menuchoice>
++							<shortcut><keycombo action="simul">&Ctrl;<keycap>G</keycap></keycombo></shortcut>
++							<guimenu>Go</guimenu>
++							<guimenuitem>Go to Page</guimenuitem>
++						</menuchoice>
++					</term>
++					<listitem>
++						<para>Open a dialog which allows you to <action>go to any page</action> of the document.</para>
++					</listitem>
++				</varlistentry>
+ 			</variablelist>
+ 		</sect1>
+ 
++		<sect1 id="menutools">
++			<title>The <guimenu>Tools</guimenu> Menu</title>
++			<variablelist>
++				<varlistentry>
++					<term>
++						<menuchoice>
++							<guimenu>Tools</guimenu>
++							<guimenuitem>Browse Tool</guimenuitem>
++						</menuchoice>
++					</term>
++					<listitem>
++						<para>The mouse will have its normal behaviour, &LMB; for dragging the document and following links and &RMB; for adding bookmarks and fit to width.</para>
++					</listitem>
++				</varlistentry>
++				<varlistentry>
++					<term>
++						<menuchoice>
++							<guimenu>Tools</guimenu>
++							<guimenuitem>Zoom Tool</guimenuitem>
++						</menuchoice>
++					</term>
++					<listitem>
++						<para>The mouse will work as a zoom tool. Clicking &LMB; and dragging will zoom the view to the selected area, clicking &RMB; will bring the document back to the previous zoom.</para>
++					</listitem>
++				</varlistentry>
++				<varlistentry>
++					<term>
++						<menuchoice>
++							<guimenu>Tools</guimenu>
++							<guimenuitem>Select Tool</guimenuitem>
++						</menuchoice>
++					</term>
++					<listitem>
++						<para>The mouse will work as a select tool. In that mode clicking &LMB; and dragging will give the option of copying the text/image of current the selected area to the clipboard, or to save it to a file.</para>
++					</listitem>
++				</varlistentry>
++			</variablelist>
++		</sect1>
++
+ 		<sect1 id="settings-menu">
+ 			<title>The <guimenu>Settings</guimenu> Menu</title>
+ 			<variablelist>
+ 				<varlistentry>
+ 					<term>
+ 						<menuchoice>
++							<shortcut><keycombo action="simul">&Ctrl;<keycap>M</keycap></keycombo></shortcut>
+ 							<guimenu>Settings</guimenu>
+-							<guimenuitem>Show Menubar</guimenuitem>
++							<guimenuitem>Show/Hide Menubar</guimenuitem>
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+@@ -456,7 +583,7 @@
+ 					<term>
+ 						<menuchoice>
+ 							<guimenu>Settings</guimenu>
+-							<guimenuitem>Show Toolbar</guimenuitem>
++							<guimenuitem>Show/Hide Toolbar</guimenuitem>
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+@@ -466,26 +593,27 @@
+ 				<varlistentry>
+ 					<term>
+ 						<menuchoice>
++							<shortcut><keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo></shortcut>
+ 							<guimenu>Settings</guimenu>
+-							<guimenuitem>Watch File</guimenuitem>
++							<guimenuitem>Show/Hide Navigation Panel</guimenuitem>
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+-						<para>If this is selected the display will <action>automatically
+-								updated</action> if the document file	changes.</para>
++						<para><action>Toggle the navigation panel</action> on and off.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 				<varlistentry>
+ 					<term>
+ 						<menuchoice>
++							<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>F</keycap></keycombo></shortcut>
+ 							<guimenu>Settings</guimenu>
+ 							<guimenuitem>Full Screen Mode</guimenuitem>
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+-						<para><action>Enables</action> the full screen mode. Note that
++						<para><action>Enables the full screen mode</action>. Note that
+ 							full screen mode is different from <link
+-								linkend="presentationMode">presentation mode</link> as the
++								linkend="presentationMode">presentation mode</link> insofar as the
+ 							only peculiarity of full screen mode is that it hides the window
+ 							decorations, the menubar and the toolbar.</para>
+ 					</listitem>
+@@ -498,8 +626,8 @@
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+-						<para>Opens a window that lets you configure the keyboard
+-							shortcuts for many menu commands.</para>
++						<para>Opens a window that lets you <action>configure the keyboard
++							shortcuts</action> for many menu commands.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 				<varlistentry>
+@@ -522,7 +650,7 @@
+ 						</menuchoice>
+ 					</term>
+ 					<listitem>
+-						<para>Opens the <link linkend="configuring">Configure</link>
++						<para>Opens the <link linkend="configure">Configure</link>
+ 							window.</para>
+ 					</listitem>
+ 				</varlistentry>
+@@ -530,26 +658,54 @@
+ 			</variablelist>
+ 		</sect1>
+ 		<sect1 id="menuhelp">
+-			<title><guimenu>Help</guimenu> Menu</title>
++			<title>The <guimenu>Help</guimenu> Menu</title>
+ 			&help.menu.documentation;
+ 		</sect1>
+ 		
+ 	</chapter>
+-	<chapter id="configuring">
++	<chapter id="configure">
+ 		<title>Configuring &kpdf;</title>
+-		<sect1 id="general">
++		<sect1 id="configindex">
++			<title>Overview</title>
++			<para>
++				You can configure &kpdf; by choosing <menuchoice><guimenu>Settings</guimenu>
++				<guimenuitem>Configure &kpdf;...</guimenuitem></menuchoice>.
++				The configuration dialogue is split into four sections. This chapter describes the available
++				options in detail.
++			</para>
++			<itemizedlist>
++				<listitem>
++					<para><link linkend="configgeneral">General</link></para>
++				</listitem>
++				<listitem>
++					<para><link linkend="configaccessibility">Accessibility</link></para>
++				</listitem>
++				<listitem>
++					<para><link linkend="configperformance">Performance</link></para>
++				</listitem>
++				<listitem>
++					<para><link linkend="configpresentation">Presentation</link></para>
++				</listitem>
++			</itemizedlist>
++			<screenshot>
++				<screeninfo>The configuration dialogue</screeninfo>
++				<mediaobject>
++					<imageobject>
++						<imagedata fileref="./configure.png" format="PNG" />
++					</imageobject>
++					<textobject>
++						<phrase>The configuration dialogue</phrase>
++					</textobject>
++				</mediaobject>
++			</screenshot>
++		</sect1>
++		<sect1 id="configgeneral">
+ 			<title>General</title>
+ 			<variablelist>
+ 				<varlistentry>
+-					<term>Show left panel</term>
++					<term>Show search bar in thumbnails list</term>
+ 					<listitem>
+-						<para>Whether to show the left panel.</para>
+-					</listitem>
+-				</varlistentry>
+-				<varlistentry>
+-					<term>Show search bar in thumbnails view</term>
+-					<listitem>
+-						<para>Whether to show search bar in thumbnails view or not. That
++						<para>Whether to the show a search bar in the thumbnails view or not. That
+ 							search bar is useful for filtering pages that contain a given
+ 							string.</para>
+ 					</listitem>
+@@ -557,14 +713,14 @@
+ 				<varlistentry>
+ 					<term>Link thumbnails list with the page</term>
+ 					<listitem>
+-						<para>Whether the thumbnails view will always show the current
++						<para>Whether the thumbnails view should always display the current
+ 							page or not.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 				<varlistentry>
+ 					<term>Show scrollbars</term>
+ 					<listitem>
+-						<para>Whether to show scrollbars.</para>
++						<para>Whether to show scrollbars for the document view.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 				<varlistentry>
+@@ -574,9 +730,22 @@
+ 							load, etc.</para>
+ 					</listitem>
+ 				</varlistentry>
++				<varlistentry>
++					<term>Obey DRM limitations</term>
++					<listitem>
++						<para>Whether &kpdf; should obey <firstterm>DRM</firstterm> (Digital Rights Management) restrictions. DRM limitations are used to make it impossible to perform certain actions with PDF documents, such as copying content to the clipboard. Note that in some configurations of &kpdf;, this option is not available.</para>
++					</listitem>
++				</varlistentry>
++				<varlistentry>
++					<term>Watch file</term>
++					<listitem>
++						<para>Whether opened files should be automatically checked for
++							changes and updated, if necessary.</para>
++					</listitem>
++				</varlistentry>
+ 			</variablelist>
+ 		</sect1>
+-		<sect1 id="accessibility">
++		<sect1 id="configaccessibility">
+ 			<title>Accessibility</title>
+ 			<variablelist>
+ 				<varlistentry>
+@@ -600,30 +769,34 @@
+ 				<varlistentry>
+ 					<term>Invert colors</term>
+ 					<listitem>
+-						<para><action>Inverts</action> colors on the view, i.e. black things will be shown white.</para>
++						<para><action>Inverts</action> colors on the view, &ie; black objects will be shown white.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 				<varlistentry>
+ 					<term>Change paper color</term>
+ 					<listitem>
+-						<para><action>Changes</action> paper color.</para>
++						<para><action>Changes</action> the paper's color, &ie; the document's background.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 				<varlistentry>
+ 					<term>Change dark and light colors</term>
+ 					<listitem>
+-						<para><action>Changes</action> the dark and light color, that means black will not be rendered as black but as the dark color and the same for white.</para>
++						<para><action>Changes</action> the dark and light color to your preference, that means 
++							black will not be rendered as black but as the selected dark color and white
++							will not be rendered as white but as the selected light color.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 				<varlistentry>
+ 					<term>Convert to black and white</term>
+ 					<listitem>
+-						<para><action>Converts</action> the document to black and white.</para>
++						<para><action>Converts</action> the document to black and white. You can set the
++							threshold and the contrast. Setting the threshold to a higher value
++							will result in darker grays used.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 			</variablelist>
+ 		</sect1>
+-		<sect1 id="performance">
++		<sect1 id="configperformance">
+ 			<title>Performance</title>
+ 			<variablelist>
+ 				<varlistentry>
+@@ -638,7 +811,7 @@
+ 					<term>Enable background generation</term>
+ 					<listitem>
+ 						<para>Use a background thread to generate the pages. By disabling
+-							this option the GUI will become less reactive (will be blocked
++							this option the user interface will become less reactive (will be blocked
+ 							if necessary), but pages will be displayed a bit faster.</para>
+ 					</listitem>
+ 				</varlistentry>
+@@ -653,13 +826,13 @@
+ 				</varlistentry>
+ 			</variablelist>
+ 		</sect1>
+-		<sect1 id="presentation">
++		<sect1 id="configpresentation">
+ 			<title>Presentation</title>
+ 			<variablelist>
+ 				<varlistentry>
+ 					<term>Advance every</term>
+ 					<listitem>
+-						<para>Enables auto advancing of pages given a time period.</para>
++						<para>Enables automatic advancing of pages given a time period.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 				<varlistentry>
+@@ -677,7 +850,8 @@
+ 				<varlistentry>
+ 					<term>Default transition</term>
+ 					<listitem>
+-						<para>The transition between page and page if the document does not specify one.</para>
++						<para>The transition effect between page and page if the document does not specify one. Set this to Random
++							Transition to make &kpdf; randomly choose one of the available effects.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 				<varlistentry>
+@@ -689,7 +863,8 @@
+ 				<varlistentry>
+ 					<term>Show progress indicator</term>
+ 					<listitem>
+-						<para>Whether to show a progress circle that shows the current page and the total number of pages on the upper right corner.</para>
++						<para>Whether to show a progress circle that shows the current page and the total number of pages on the upper
++							right corner of the presentation screen everytime you change the page.</para>
+ 					</listitem>
+ 				</varlistentry>
+ 				<varlistentry>
+@@ -708,16 +883,43 @@
+ 			<title>Program Copyright:</title>
+ 			<listitem><para>Albert Astals Cid<email>tsdgeos at yahoo.es</email> Current maintainer</para></listitem>
+ 			<listitem><para>Christophe Devriese<email>oelewapperke at ulyssis.org</email></para></listitem>
+-			<listitem><para>Wilco Greven <email>greven at kde.org</email> Original author</para></listitem>
++			<listitem><para>&Wilco.Greven; Wilco.Greven.mail; Original author</para></listitem>
+ 			<listitem><para>Enrico Ros<email>eros.kde at email.it</email> Refactoring for 3.4</para></listitem>
++			<listitem><para>Laurent Montel<email>montel at kde.org</email></para></listitem>
+ 		</itemizedlist>
+-		
++		&underGPL;
++
++		<itemizedlist>
++			<title>Documentation Copyright:</title>
++			<listitem><para>Albert Astals Cid<email>tsdgeos at yahoo.es</email> Author</para></listitem>
++			<listitem><para>Titus Laska<email>titus.laska at gmx.de</email> Some updates and additions</para></listitem>
++		</itemizedlist>
++		<!-- TRANS:CREDIT_FOR_TRANSLATORS -->
+ 		&underFDL;
+ 		&underGPL;
+ 	</chapter>
++
++	<appendix id="installation">
++		<title>Installation</title>
++		<sect1 id="getting-kapp">
++			<title>How to obtain &kpdf;</title>
++			&install.intro.documentation;
++		</sect1>
++		<sect1 id="compilation">
++			<title>Compilation and Installation</title>
++			<note>
++				<para>
++					If you are reading this help in the &khelpcenter;, &kpdf; has already been
++					installed on this system and you do not need install it anymore.
++				</para>
++			</note>
++			&install.compile.documentation;
++		</sect1>
++	</appendix>
+ 	&documentation.index; 
+ </book>
+ 
++
+ <!--
+ Local Variables:
+ mode: sgml
+--- doc/kruler/index.docbook	(revision 484288)
++++ doc/kruler/index.docbook	(revision 490050)
+@@ -16,7 +16,7 @@
+ <firstname>Lauri</firstname>
+ <surname>Watts</surname>
+ <affiliation>
+-<address><email>lauri at kde.org</email></address>
++<address><email>&Lauri.Watts.mail;</email></address>
+ </affiliation>
+ </author>
+ 
+@@ -27,11 +27,11 @@
+ 
+ <copyright>
+ <year>2001</year>
+-<holder>Lauri Watts</holder>
++<holder>&Lauri.Watts;</holder>
+ </copyright>
+ 
+-<date>2003-09-27</date>
+-<releaseinfo>3.2</releaseinfo>
++<date>2005-12-10</date>
++<releaseinfo>3.5</releaseinfo>
+ 
+ <!-- Abstract about this handbook -->
+ 
+@@ -56,17 +56,18 @@
+ measure distances on your screen.</para>
+ 
+ <para>To start &kruler;, choose <menuchoice><guimenu>Graphics</guimenu> 
++<guisubmenu>More Applications</guisubmenu>
+ <guimenuitem>KDE Screen Ruler</guimenuitem></menuchoice> from your
+ <guimenu>K</guimenu> menu.</para>
+ 
+-<para>&LMB; clicking on the &kruler; will turn the cursor into a hand icon, and
+-enable you to drag &kruler; around the screen.</para>
++<para>Clicking with the &LMB; on the &kruler; will turn the cursor to a cross
++with four arrows and enables you to drag &kruler; around the screen.</para>
+ 
+ <para>When you move the mouse over &kruler;, your cursor will turn into an
+ elongated arrow, with a circle at one end.  As you move the cursor, &kruler; will
+ display how far from the point marked <guilabel>0</guilabel> the circle on the
+ end of the cursor currently is.  &kruler; will also display the
+-<acronym>HTML</acronym> color code of the color currently under the circle.
++&HTML; color code of the color currently under the circle.
+ This is very useful for picking out colors from an image.  If you move the
+ mouse far enough that the arrow cursor is no longer touching &kruler;, the
+ cursor will revert to normal, allowing you to carry on working with your other
+@@ -80,7 +81,7 @@
+ <chapter id="menu-reference">
+ <title>Menu Reference</title>
+ 
+-<para>&RMB; clicking on the ruler will pop up a context menu, with the
++<para>Clicking with the &RMB; on the ruler will pop up a context menu, with the
+ following entries:</para>
+ 
+ <variablelist>
+@@ -201,8 +202,8 @@
+ <varlistentry>
+ <term>
+ <menuchoice>
+-<shortcut>
+-&Ctrl;<keycap>S</keycap>
++<shortcut><keycombo action="simul">&Ctrl;
++<keycap>S</keycap></keycombo>
+ </shortcut>
+ <guisubmenu>Length</guisubmenu>
+ <guimenuitem>Short</guimenuitem>
+@@ -216,7 +217,7 @@
+ <term>
+ <menuchoice>
+ <shortcut>
+-&Ctrl;<keycap>M</keycap>
++<keycombo action="simul">&Ctrl;<keycap>M</keycap></keycombo>
+ </shortcut>
+ <guisubmenu>Length</guisubmenu>
+ <guimenuitem>Medium</guimenuitem>
+@@ -230,7 +231,7 @@
+ <term>
+ <menuchoice>
+ <shortcut>
+-&Ctrl;<keycap>T</keycap>
++<keycombo action="simul">&Ctrl;<keycap>T</keycap></keycombo>
+ </shortcut>
+ <guisubmenu>Length</guisubmenu>
+ <guimenuitem>Tall</guimenuitem>
+@@ -244,7 +245,7 @@
+ <term>
+ <menuchoice>
+ <shortcut>
+-&Ctrl;<keycap>F</keycap>
++<keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo>
+ </shortcut>
+ <guisubmenu>Length</guisubmenu>
+ <guimenuitem>Full Screen Width</guimenuitem>
+@@ -260,70 +261,52 @@
+ <varlistentry>
+ <term>
+ <menuchoice>
++<shortcut>
++<keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo>
++</shortcut>
+ <guimenuitem>Choose Color...</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<para>Opens a normal &kde; color picker dialog, where you can choose the
++<para>Displays the standard &kde; color picker dialog, where you can choose the
+ background color for &kruler;.</para>
+ </listitem>
+ </varlistentry>
++
+ <varlistentry>
+ <term>
+ <menuchoice>
+-<guisubmenu>Help</guisubmenu>
++<shortcut>
++<keycombo action="simul"><keycap>F</keycap></keycombo>
++</shortcut>
++<guimenuitem>Choose Font...</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+-<variablelist>
+-<varlistentry>
+-<term>
+-<menuchoice>
+-<guisubmenu>Help</guisubmenu>
+-<guimenuitem>KRuler Handbook</guimenuitem>
+-</menuchoice>
+-</term>
+-<listitem><para>This invokes the &kde; help system starting at the &kruler; help
+-pages (this document).</para> </listitem>
++<para>Displays the standard &kde; font dialog where you can choose the font for
++&kruler;.</para>
++</listitem>
+ </varlistentry>
++
+ <varlistentry>
+ <term>
+ <menuchoice>
+ <guisubmenu>Help</guisubmenu>
+-<guimenuitem>What's This?</guimenuitem>
+-</menuchoice></term>
+-<listitem><para><action>This changes the mouse cursor to a combination arrow and
+-question mark.</action> Clicking on items within &kruler; with this arrow will
+-open a help window (if one exists for the particular item) explaining the item's
+-function.</para></listitem>
+-</varlistentry>
+-<varlistentry>
+-<term>
+-<menuchoice>
+-<guisubmenu>Help</guisubmenu>
+-<guimenuitem>About KRuler</guimenuitem>
+ </menuchoice>
+ </term> 
+ <listitem>
+-<para><action>This will displays version and author information.</action></para>
++&help.menu.documentation;
+ </listitem>
+ </varlistentry>
+-<varlistentry>
+-<term>
+-<menuchoice>
+-<guimenu>Help</guimenu>
+-<guimenuitem>About KDE</guimenuitem>
+-</menuchoice>
+-</term>
+-<listitem><para><action>This displays the &kde; version and other basic
+-information.</action></para></listitem>
+-</varlistentry>
+ </variablelist>
+-</listitem>
+-</varlistentry>
++
++<variablelist>
+ <varlistentry>
+ <term>
+ <menuchoice>
++<shortcut>
++<keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>
++</shortcut>
+ <guimenuitem>Quit</guimenuitem>
+ </menuchoice>
+ </term>
+@@ -345,8 +328,8 @@
+ <para>Thanks to Gunnstein Lye <email>gl at ez.no</email> for the initial port to
+ &kde; 2</para>
+ 
+-<para>Documentation Copyright Lauri Watts
+-<email>lauri at kde.org</email></para>
++<para>Documentation Copyright &Lauri.Watts;
++&Lauri.Watts.mail;</para>
+ 
+ <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
+ 
+--- doc/kghostview/index.docbook	(revision 484288)
++++ doc/kghostview/index.docbook	(revision 490050)
+@@ -15,7 +15,7 @@
+ <firstname>Pamela</firstname>
+ <surname>Roberts</surname>
+ <affiliation>
+-<address><email>pamroberts at blueyonder.co.uk</email></address>
++<address>&Pamela.Roberts.mail;</address>
+ </affiliation>
+ </author>
+ 
+@@ -24,12 +24,12 @@
+ 
+ <copyright>
+ <year>2001</year> <year>2002</year>
+-<holder>Pamela Roberts</holder>
++<holder>&Pamela.Roberts;</holder>
+ </copyright>
+ 
+ <legalnotice>&FDLNotice;</legalnotice>
+ 
+-<date>2005-05-19</date>
++<date>2005-12-10</date>
+ <releaseinfo>0.20</releaseinfo>
+ 
+ <abstract>
+@@ -92,13 +92,13 @@
+ 
+ <para>
+ You can open multiple instances of &kghostview; to view multiple
+-documents. The title bar at the top of a window shows you the name of
++documents. The titlebar at the top of a window shows you the name of
+ the document in that window.
+ </para>
+ 
+ <para>
+ The main area displays a page of the current document. If the page is
+-too large to fit inside the window, scroll bars are automatically added
++too large to fit inside the window, scrollbars are automatically added
+ to the sides of the display, although these can be disabled with the
+ <guimenu>Settings</guimenu> menu.
+ </para>
+@@ -111,11 +111,10 @@
+ <para>
+ You can scroll up and down in a page with the <keysym>Up
+ Arrow</keysym> and <keysym>Down Arrow</keysym> keys, or use the
+-<menuchoice><guimenu>View</guimenu><guimenuitem>Read Up</guimenuitem></menuchoice> (<keycombo action="simul">&Shift;<keycap>Space
+-</keycap></keycombo>) and <menuchoice><guimenu>View</guimenu>
+-<guimenuitem>Read Down</guimenuitem></menuchoice>
+-(<keycombo action="simul">&Ctrl;<keycap>Space</keycap></keycombo>)
+-options to scroll through the entire document.
++<menuchoice><guimenu>View</guimenu><guimenuitem>Read Up</guimenuitem></menuchoice> 
++(<keycap>PageUp</keycap>) and <menuchoice><guimenu>View</guimenu>
++<guimenuitem>Read Down</guimenuitem></menuchoice> 
++(<keycap>PageDown</keycap>) options to scroll through the entire document.
+ </para>
+ 
+ <para>The
+@@ -136,11 +135,11 @@
+ <para>
+ You can toggle the <quote>page marked</quote> flag for the currently
+ displayed page with <keycombo
+-action="simul"><keycap>Ctrl</keycap><keycap>M</keycap></keycombo> or for
++action="simul"><keycap>&Ctrl;</keycap><keycap>M</keycap></keycombo> or for
+ any page by &MMB; clicking on it in the Page List. You can also clear or
+-change your page marks using the drop-down menu that is activated by
++change your page marks using the context menu that is activated by
+ &RMB; clicking anywhere in the Page List area or by selecting the <link
+-linkend="pagemarks">PageMarks</link> menu.
++linkend="menuedit">Edit</link> menu.
+ </para>
+ 
+ </chapter>
+@@ -170,7 +169,7 @@
+ <guimenu>File</guimenu>
+ <guimenuitem>Open Recent</guimenuitem>
+ </menuchoice></term>
+-<listitem><para><action>Open</action> a file selected from a drop-down list of
++<listitem><para><action>Open</action> a file selected from a combo box of
+ recently opened files. If a file is currently being displayed it will be
+ closed.</para></listitem>
+ </varlistentry>
+@@ -199,7 +198,7 @@
+ <varlistentry>
+ <term><menuchoice>
+ <guimenu>File</guimenu>
+-<guimenuitem>Document Info...</guimenuitem>
++<guimenuitem>Document Info</guimenuitem>
+ </menuchoice></term>
+ <listitem><para><action>Display</action> some basic information about
+ the document.</para> </listitem>
+@@ -220,6 +219,81 @@
+ 
+ </sect1>
+ 
++<sect1 id="menuedit">
++<title>The <guimenu>Edit</guimenu> Menu</title>
++
++<note>
++<para>
++You can also get this menu by &RMB; clicking anywhere in the Page List
++area.
++</para>
++</note>
++
++<variablelist>
++
++<varlistentry>
++<term><menuchoice>
++<shortcut><keycombo action="simul">&Ctrl;&Shift;
++<keycap>M</keycap></keycombo></shortcut>
++<guimenu>Edit</guimenu>
++<guimenuitem>Mark Current Page</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Toggle the page marked
++flag</action> for the current page.</para> </listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<guimenu>Edit</guimenu>
++<guimenuitem>Mark All Pages</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Set the page marked
++flag</action> for all pages of the document.</para> </listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<guimenu>Edit</guimenu>
++<guimenuitem>Mark Even Pages</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Set the page marked
++flag</action> for all even numbered pages in the document. Used in
++conjunction with <guimenuitem>Mark Odd Pages</guimenuitem> or
++<guimenuitem>Toggle Page Marks</guimenuitem> this provides a convenient way of
++double-sided printing a document on a single sided printer</para> </listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<guimenu>Edit</guimenu>
++<guimenuitem>Mark Odd Pages</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Set the page marked
++flag</action> for all odd numbered pages in the document.</para> </listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<guimenu>Edit</guimenu>
++<guimenuitem>Toggle Page Marks</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Toggle the page marked
++flags</action> for all pages in the document.</para> </listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<guimenu>Edit</guimenu>
++<guimenuitem>Remove Page Marks</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Clear the page marked
++flags</action> for all pages in the document.</para></listitem>
++</varlistentry>
++
++</variablelist>
++
++</sect1>
++
+ <sect1 id="view">
+ <title>The <guimenu>View</guimenu> Menu</title>
+ 
+@@ -227,20 +301,42 @@
+ 
+ <varlistentry>
+ <term><menuchoice>
++<shortcut>
++<keycap>F5</keycap>
++</shortcut>
+ <guimenu>View</guimenu>
+-<guimenuitem>Redisplay</guimenuitem>
++<guimenuitem>Reload</guimenuitem>
+ </menuchoice></term>
+ <listitem><para><action>Re-render</action> the current document page.</para>
+ </listitem> </varlistentry>
+ 
+ <varlistentry>
+ <term><menuchoice>
+-<guimenu>View</guimenu>
+-<guimenuitem>Fit To Page Width</guimenuitem>
+-</menuchoice></term>
+-<listitem><para><action>Scale</action> the display so a page width fits
+-exactly across the main display area.</para> </listitem> </varlistentry>
++<shortcut><keycap>M</keycap></shortcut>
++<guimenu>Edit</guimenu>
++<guimenuitem>Maximize</guimenuitem></menuchoice>
++</term>
++<listitem>
++<para>This option maximizes the &kghostview; window.</para> 
++</listitem>
++</varlistentry>
+ 
++<varlistentry>
++<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;
++<keycap>F</keycap></keycombo></shortcut>
++<guimenu>Edit</guimenu>
++<guimenuitem>Full Screen Mode</guimenuitem></menuchoice>
++</term>
++<listitem>
++<para>This option maximizes the &kghostview; window and the currently shown page.
++Even the window decorations (titlebar &etc;) are temporarily removed.
++To switch back to normal window mode, press the <keycap>ESC</keycap> key or 
++the shortcut <keycombo action="simul">&Ctrl;&Shift;
++<keycap>F</keycap></keycombo> again, or open the context menu with a &RMB; click
++and select <guimenuitem>Exit Full Screen Mode</guimenuitem>.
++</para> 
++</listitem>
++</varlistentry>
+ 
+ <varlistentry>
+ <term><menuchoice>
+@@ -276,6 +372,15 @@
+ document view.</para> </listitem> </varlistentry>
+ 
+ <varlistentry>
++<term><guiicon>Zoom</guiicon></term>
++<listitem>
++<para>
++<action>Select a predefined zoom factor.</action>
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
+ <term><menuchoice>
+ <shortcut><keycombo action="simul">&Ctrl;
+ <keycap>-</keycap></keycombo></shortcut>
+@@ -287,9 +392,26 @@
+ 
+ <varlistentry>
+ <term><menuchoice>
+-<shortcut><keycap>Page Up</keycap>
+-</shortcut>
+ <guimenu>View</guimenu>
++<guimenuitem>Fit to Page Width</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Scale</action> the display so a page width fits
++exactly across the main display area.</para> </listitem> </varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<shortcut><keycap>S</keycap></shortcut>
++<guimenu>View</guimenu>
++<guimenuitem>Fit to Screen</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Scale</action> the display so the entire page fits
++exactly across the main display area.</para> </listitem> </varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<shortcut><keycombo action="simul">&Ctrl;
++<keycap>PageUp</keycap></keycombo></shortcut>
++<guimenu>View</guimenu>
+ <guimenuitem>Previous Page</guimenuitem>
+ </menuchoice></term>
+ <listitem><para>View the <action>previous page</action> of the
+@@ -297,8 +419,8 @@
+ 
+ <varlistentry>
+ <term><menuchoice>
+-<shortcut><keycap>Page Down</keycap>
+-</shortcut>
++<shortcut><keycombo action="simul">&Ctrl;
++<keycap>PageDown</keycap></keycombo></shortcut>
+ <guimenu>View</guimenu>
+ <guimenuitem>Next Page</guimenuitem>
+ </menuchoice></term>
+@@ -328,15 +450,14 @@
+ <varlistentry>
+ <term><menuchoice>
+ <guimenu>View</guimenu>
+-<guimenuitem>Go to Page...</guimenuitem>
++<guimenuitem>Go to Page</guimenuitem>
+ </menuchoice></term>
+ <listitem><para><action>Go to a selected page</action> of the
+ document.</para> </listitem> </varlistentry>
+ 
+ <varlistentry>
+ <term><menuchoice>
+-<shortcut><keycombo action="simul">&Shift;
+-<keycap>Space</keycap></keycombo></shortcut>
++<shortcut><keycap>PageUp</keycap></shortcut>
+ <guimenu>View</guimenu>
+ <guimenuitem>Read Up</guimenuitem>
+ </menuchoice></term>
+@@ -345,120 +466,108 @@
+ 
+ <varlistentry>
+ <term><menuchoice>
++<shortcut><keycap>PageDown</keycap></shortcut>
+ <guimenu>View</guimenu>
+ <guimenuitem>Read Down</guimenuitem>
+ </menuchoice></term>
+ <listitem><para><action>Scroll forwards</action> through the
+ document.</para> </listitem> </varlistentry>
+ 
+-
+ </variablelist>
+ 
+ </sect1>
+ 
+-<sect1 id="pagemarks">
+-<title>The <guimenu>PageMarks</guimenu> Menu</title>
++<sect1 id="settings">
++<title>The <guimenu>Settings</guimenu> Menu</title>
+ 
+-<note>
+-<para>
+-You can also get this menu by &RMB; clicking anywhere in the Page List
+-area.
+-</para>
+-</note>
+-
+ <variablelist>
+ 
+ <varlistentry>
+-<term><menuchoice>
+-<shortcut><keycombo action="simul">&Ctrl;
+-<keycap>M</keycap></keycombo></shortcut>
+-<guimenu>PageMarks</guimenu>
+-<guimenuitem>Mark Current Page</guimenuitem>
++<term><menuchoice><shortcut><keycombo action="simul">
++&Ctrl;<keycap>M</keycap></keycombo></shortcut>
++<guimenu>Settings</guimenu>
++<guimenuitem>Show/Hide Menubar</guimenuitem>
+ </menuchoice></term>
+-<listitem><para><action>Toggle the page marked
+-flag</action> for the current page.</para> </listitem>
++<listitem><para><action>Toggles the menubar on/off.</action></para></listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+ <term><menuchoice>
+-<guimenu>PageMarks</guimenu>
+-<guimenuitem>Mark All Pages</guimenuitem>
++<guimenu>Settings</guimenu>
++<guimenuitem>Show/Hide Toolbar</guimenuitem>
+ </menuchoice></term>
+-<listitem><para><action>Set the page marked
+-flag</action> for all pages of the document.</para> </listitem>
+-</varlistentry>
++<listitem><para><action>Toggle the Toolbar display</action> on
++and off.</para></listitem> </varlistentry>
+ 
+ <varlistentry>
+ <term><menuchoice>
+-<guimenu>PageMarks</guimenu>
+-<guimenuitem>Mark Even Pages</guimenuitem>
++<guimenu>Settings</guimenu>
++<guimenuitem>Show/Hide Statusbar</guimenuitem>
+ </menuchoice></term>
+-<listitem><para><action>Set the page marked
+-flag</action> for all even numbered pages in the document. Used in
+-conjunction with <guimenuitem>Mark Odd Pages</guimenuitem> or
+-<guimenuitem>Toggle Page Marks</guimenuitem> this provides a convenient way of
+-double-sided printing a document on a single sided printer</para> </listitem>
+-</varlistentry>
++<listitem><para><action>Toggle the Status bar display</action> on
++and off.</para></listitem> </varlistentry>
+ 
+ <varlistentry>
+-<term><menuchoice>
+-<guimenu>PageMarks</guimenu>
+-<guimenuitem>Mark Odd Pages</guimenuitem>
+-</menuchoice></term>
+-<listitem><para><action>Set the page marked
+-flag</action> for all odd numbered pages in the document.</para> </listitem>
++<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;
++<keycap>F</keycap></keycombo></shortcut>
++<guimenu>Edit</guimenu>
++<guimenuitem>Full Screen Mode</guimenuitem></menuchoice>
++</term>
++<listitem>
++<para>This option maximizes the &kghostview; window and the currently shown page.
++Even the window decorations (titlebar &etc;) are temporarily removed.
++To switch back to normal window mode, press the <keycap>ESC</keycap> key or 
++the shortcut <keycombo action="simul">&Ctrl;&Shift;
++<keycap>F</keycap></keycombo> again, or open the context menu with a &RMB; click
++and select <guimenuitem>Exit Full Screen Mode</guimenuitem>.
++</para> 
++</listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+ <term><menuchoice>
+-<guimenu>PageMarks</guimenu>
+-<guimenuitem>Toggle Page Marks</guimenuitem>
++<guimenu>Settings</guimenu>
++<guimenuitem>Configure Shortcuts...</guimenuitem>
+ </menuchoice></term>
+-<listitem><para><action>Toggle the page marked
+-flags</action> for all pages in the document.</para> </listitem>
++<listitem><para><action>Opens a dialog for changing the shortcuts.</action>
++Using this option you can change the standard key shortcut for &kghostview;'s commands
++or create new ones.</para></listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+ <term><menuchoice>
+-<guimenu>PageMarks</guimenu>
+-<guimenuitem>Remove Page Marks</guimenuitem>
++<guimenu>Settings</guimenu>
++<guimenuitem>Configure Toolbars...</guimenuitem>
+ </menuchoice></term>
+-<listitem><para><action>Clear the page marked
+-flags</action> for all pages in the document.</para></listitem>
++<listitem><para><action>Opens a dialog for configuring the toolbar.</action> You
++can add and remove toolbuttons for &kghostview;'s commands with this
++option.</para></listitem>
+ </varlistentry>
+ 
+-</variablelist>
+-
+-</sect1>
+-
+-<sect1 id="settings">
+-<title>The <guimenu>Settings</guimenu> Menu</title>
+-
+-<variablelist>
+-
+ <varlistentry>
+ <term><menuchoice>
+ <guimenu>Settings</guimenu>
+-<guimenuitem>Show Toolbar</guimenuitem>
++<guimenuitem>Show/Hide Scrollbars</guimenuitem>
+ </menuchoice></term>
+-<listitem><para><action>Toggle the Toolbar display</action> on
+-and off.</para></listitem> </varlistentry>
++<listitem><para><action>Toggle the horizontal and vertical scrollbars</action>
++on and off.</para></listitem> </varlistentry>
+ 
+ <varlistentry>
+ <term><menuchoice>
+ <guimenu>Settings</guimenu>
+-<guimenuitem>Show Statusbar</guimenuitem>
++<guimenuitem>Show Page List</guimenuitem>
+ </menuchoice></term>
+-<listitem><para><action>Toggle the Statusbar display</action> on
+-and off.</para></listitem> </varlistentry>
++<listitem><para><action>Toggle the Page List</action>
++on and off.</para></listitem> </varlistentry>
+ 
+ <varlistentry>
+ <term><menuchoice>
+ <guimenu>Settings</guimenu>
+-<guimenuitem>Show Scrollbars</guimenuitem>
++<guimenuitem>Show Page Labels</guimenuitem>
+ </menuchoice></term>
+-<listitem><para><action>Toggle the horizontal and vertical scrollbars</action>
+-on and off.</para></listitem> </varlistentry>
++<listitem><para>If this is selected the <action>name (if any) of the
++current page is displayed in the Status Bar</action>.</para></listitem>
++</varlistentry>
+ 
+ <varlistentry>
+ <term><menuchoice>
+@@ -472,23 +581,16 @@
+ <varlistentry>
+ <term><menuchoice>
+ <guimenu>Settings</guimenu>
+-<guimenuitem>Show Page List</guimenuitem>
++<guimenuitem>No Flicker</guimenuitem>
+ </menuchoice></term>
+-<listitem><para><action>Toggle the Page List</action>
+-on and off.</para></listitem> </varlistentry>
++<listitem><para>
++If this is selected the display will start showing objects instantly as they are rendered, 
++otherwise the whole page is rendered off-screen and then displayed.
++</para></listitem> </varlistentry>
+ 
+ <varlistentry>
+ <term><menuchoice>
+ <guimenu>Settings</guimenu>
+-<guimenuitem>Show Page Labels</guimenuitem>
+-</menuchoice></term>
+-<listitem><para>If this is selected the <action>name (if any) of the
+-current page is displayed in the Status Bar</action>.</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><menuchoice>
+-<guimenu>Settings</guimenu>
+ <guimenuitem>Configure &kghostview;...</guimenuitem>
+ </menuchoice></term>
+ <listitem><para>Brings up the &kghostview;
+@@ -514,29 +616,29 @@
+ The configuration dialog box is accessed with the
+ <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
+ &kghostview;...</guimenuitem></menuchoice> option. It has two pages;
+-<guilabel>General settings</guilabel> and <guilabel>Ghostscript
+-configuration</guilabel>
++<guilabel>General</guilabel> and <guilabel>Ghostscript
++Configuration</guilabel>
+ </para>
+ 
+ <sect1 id="general-settings">
+-<title>General settings</title>
++<title>General Settings</title>
+ 
+ <para>
+ You can select <guilabel>Enable anti-aliasing of fonts and
+ images</guilabel> to get smoothly rendered text, but note that
+-antialiasing is memory intensive and slower than straightforward
++anti-aliasing is memory intensive and slower than straightforward
+ rendering of fonts. Early versions of
+-<application>Ghostscript</application> could not perform antialiasing.
++<application>Ghostscript</application> could not perform anti-aliasing.
+ </para>
+ 
+ <para>
+-Select <guilabel>Use Platform fonts</guilabel> if you wish to use your
++Select <guilabel>Use platform fonts</guilabel> if you wish to use your
+ native system fonts rather than those that come with
+ <application>Ghostscript</application>.
+ </para>
+ 
+ <para>
+-Turn <guilabel>Show Ghostscript Messages in a separate box</guilabel>
++Turn <guilabel>Show Ghostscript messages in a separate box</guilabel>
+ on if you want to be informed of any output or error messages
+ generated by the <application>Ghostscript</application> interpreter.
+ </para>
+@@ -550,13 +652,13 @@
+ </sect1>
+ 
+ <sect1 id="ghostscript-config">
+-<title><application>Ghostscript</application> configuration</title>
++<title><application>Ghostscript</application> Configuration</title>
+ 
+ <para>
+ In this dialog box page you can set the name of the
+-<application>Ghostscript</application> <guilabel>Interpreter</guilabel>
++<application>Ghostscript</application> <guilabel>Interpreter:</guilabel>
+ executable and the <guilabel>Non-antialiasing arguments:</guilabel> and
+-the <guilabel>Antialiasing arguments</guilabel> passed to it. The
++the <guilabel>Antialiasing arguments:</guilabel> passed to it. The
+ default settings should be suitable for most systems.
+ </para>
+ 
+@@ -574,28 +676,28 @@
+ 
+ <itemizedlist>
+ <title>Program Copyright:</title>
+-<listitem><para>Mark Donohoe <email>donohoe at kde.org</email> (original author) 1998
++<listitem><para>&Mark.Donohoe; Mark.Donohoe.mail; (original author) 1998
+ </para></listitem>
+-<listitem><para>David Sweet <email>dsweet at kde.org</email>
++<listitem><para>&David.Sweet; &David.Sweet.mail;
+ Maintainer 1999-2000
+ </para></listitem>
+-<listitem><para>Wilco Greven <email>greven at kde.org</email>
++<listitem><para>&Wilco.Greven; &Wilco.Greven.mail;
+ Current maintainer
+ </para></listitem>
+-<listitem><para>David Faure <email>faure at kde.org</email> (basis for
++<listitem><para>&David.Faure; &David.Faure.mail; (basis for
+ shell)</para>
+ </listitem>
+ <listitem><para>Daniel Duley <email>mosfet at kde.org</email> (port to
+ Kparts)</para>
+ </listitem>
+-<listitem><para>Espen Sand <email>epsen at kde.org</email> (dialog boxes)</para>
++<listitem><para>&Espen.Sand; &Espen.Sand.mail; (dialog boxes)</para>
+ </listitem>
+ </itemizedlist>
+ 
+ 
+ <para>
+-Documentation copyright 2001, 2002 Pamela Roberts
+-<email>pamroberts at blueyonder.co.uk</email>
++Documentation copyright 2001, 2002 &Pamela.Roberts;
++&Pamela.Roberts.mail;
+ </para>
+ 
+ 
+--- kuickshow/src/kuickshow.desktop	(revision 484288)
++++ kuickshow/src/kuickshow.desktop	(revision 490050)
+@@ -12,7 +12,6 @@
+ Name[ta]=விரைவுகாட்சி
+ Name[th]=ดูภาพด่วน - K
+ Name[ven]=Musumbedzo wa kuick
+-Name[xx]=xxKuickshowxx
+ Name[zu]=I Kuickshow
+ Exec=kuickshow %i %m -caption "%c" %U
+ Icon=kuickshow
+@@ -78,7 +77,6 @@
+ GenericName[ven]=Tshivhoni tsha Mutaleli
+ GenericName[wa]=Håyneu d' imådjes
+ GenericName[xh]=Umboniseli Womfanekiso
+-GenericName[xx]=xxImage Viewerxx
+ GenericName[zh_CN]=图片查看程序
+ GenericName[zh_TW]=影像檢視程式
+ GenericName[zu]=Umbonisi Womfanekiso
+--- kolourpaint/kolourpaint.desktop	(revision 484288)
++++ kolourpaint/kolourpaint.desktop	(revision 490050)
+@@ -6,7 +6,6 @@
+ Name[pa]=ਕੇ-ਰੰਗ-ਪੇਂਟ
+ Name[sv]=Kolourpaint
+ Name[ta]=நிற பெயின்ட் 
+-Name[xx]=xxKolourPaintxx
+ GenericName=Paint Program
+ GenericName[af]=Verf Program
+ GenericName[ar]=برنامج تلوين
+@@ -63,7 +62,6 @@
+ GenericName[ven]=Mbekanyamushumo ya Pennde
+ GenericName[wa]=Program di dessinaedje
+ GenericName[xh]=Udweliso lwenkqubo lwepeyinti
+-GenericName[xx]=xxPaint Programxx
+ GenericName[zh_CN]=绘图程序
+ GenericName[zh_TW]=繪圖程式
+ GenericName[zu]=Elila Iprogremu Kapende
+--- ksvg/core/ksvgrenderer.desktop	(revision 484288)
++++ ksvg/core/ksvgrenderer.desktop	(revision 490050)
+@@ -41,7 +41,6 @@
+ Comment[tg]=Лағжандаи тасовироти KSVG
+ Comment[tr]=KSVG Tarama Arkayüzü
+ Comment[uk]=Інтерфейс відтворення KSVG
+-Comment[xx]=xxKSVG Rendering Backendxx
+ Comment[zh_CN]=KSVG 渲染后端
+ 
+ [PropertyDef::X-KSVG-InternalName]
+--- ksvg/plugin/ksvgplugin.desktop	(revision 484288)
++++ ksvg/plugin/ksvgplugin.desktop	(revision 490050)
+@@ -18,7 +18,6 @@
+ Name[ta]=KSVGசொருகுப்பொருள்
+ Name[tr]=KSVG Eklentisi
+ Name[xh]=Iplagi efakiweyo ye KSVG
+-Name[xx]=xxKSVGPluginxx
+ Name[zu]=Iplagi efakiweyo ye KSVG
+ Icon=vectorgfx
+ MimeType=image/svg+xml
+@@ -69,7 +68,6 @@
+ Comment[uz]=SVG кўрувчи
+ Comment[ven]=Muvhono wa girafiki wa scalable vector
+ Comment[xh]=Umboniseli wemizobo olinganiselwayo onesalathiso
+-Comment[xx]=xxScalable Vector Graphics Viewerxx
+ Comment[zh_CN]=可缩放矢量图查看器
+ Comment[zu]=Umbonisi wemidwebo Onenani Elibalekayo
+ Type=Service
+--- ksvg/plugin/backends/libart/ksvglibartcanvas.desktop	(revision 484288)
++++ ksvg/plugin/backends/libart/ksvglibartcanvas.desktop	(revision 490050)
+@@ -40,7 +40,6 @@
+ Name[tg]=Лағжандаи тасовироти KSVG - Libart
+ Name[tr]=KSVG Derleme Aracı - Libart
+ Name[uk]=Інтерфейс відтворення KSVG - Libart
+-Name[xx]=xxKSVG Rendering Backend - Libartxx
+ Name[zh_CN]=KSVG 渲染后端 - Libart
+ Comment=Mature ksvg rendering backend
+ Comment[ar]=خلفية الرسم لksvg البالغة
+@@ -78,6 +77,5 @@
+ Comment[tg]=Лағжандаи тасовироти кӯҳнаи ksvg
+ Comment[tr]=Tamamlanmış ksvg derleme aracı
+ Comment[uk]=Стабільний інтерфейс відтворення KSVG
+-Comment[xx]=xxMature ksvg rendering backendxx
+ Comment[zh_CN]=稳定的 ksvg 渲染后端
+ author=Nikolas Zimmermann <wildfox at kde.org>
+--- ksvg/plugin/backends/agg/ksvgaggcanvas.desktop	(revision 484288)
++++ ksvg/plugin/backends/agg/ksvgaggcanvas.desktop	(revision 490050)
+@@ -41,7 +41,6 @@
+ Name[tg]=Лағжандаи тасовироти KSVG - геометрияи мутақобили гандумӣ
+ Name[tr]=KSVG Derleme Aracı - Taneciksiz Geometri
+ Name[uk]=Інтерфейс відтворення KSVG - AGG
+-Name[xx]=xxKSVG Rendering Backend - Anti Grain Geometryxx
+ Name[zh_CN]=KSVG 渲染后端 - 反增长几何形状
+ Comment=New, unstable ksvg rendering backend
+ Comment[ar]=خلفية الرسم ل ksvg الجديدة والغير مستقرة
+@@ -80,6 +79,5 @@
+ Comment[tg]=Лағжандаи ғайриустувори тасовироти ksvg-и нав
+ Comment[tr]=Yeni, stabil olmayan ksvg derleme aracı
+ Comment[uk]=Новий, нестабільний інтерфейс відтворення KSVG
+-Comment[xx]=xxNew, unstable ksvg rendering backendxx
+ Comment[zh_CN]=新的不稳定的 ksvg 渲染后端
+ author=Rob Buis <buis at kde.org>
+--- ksvg/plugin/svgthumbnail.desktop	(revision 484288)
++++ ksvg/plugin/svgthumbnail.desktop	(revision 490050)
+@@ -35,7 +35,6 @@
+ Name[uk]=Масштабовна векторна графіка
+ Name[ven]=Dzigirafiki ya vekitha ya Scalable
+ Name[xh]=Imizobo elinganiselwayo enesalathisi
+-Name[xx]=xxScalable Vector Graphicsxx
+ Name[zh_CN]=可缩放矢量图
+ Name[zu]=Imidwebo Enenani Elibalekayo
+ Icon=thumbnail
+--- ksnapshot/ksnapshot.desktop	(revision 484288)
++++ ksnapshot/ksnapshot.desktop	(revision 490050)
+@@ -54,7 +54,6 @@
+ GenericName[ven]=Mbekanya mushumo ino gavha tshikirini
+ GenericName[wa]=Programe po fé des waitroûlêyes
+ GenericName[xh]=Iinkcazelo Ezigcina Ikhusi
+-GenericName[xx]=xxScreen Capture Programxx
+ GenericName[zh_CN]=屏幕截图程序
+ GenericName[zh_TW]=畫面擷取程式
+ GenericName[zu]=Iprogremu Yokubamba Isikrini
+@@ -71,7 +70,6 @@
+ Name[th]=จับภาพ - K
+ Name[ven]=Tshinepe tsha K
+ Name[wa]=KWaitroûlêye
+-Name[xx]=xxKSnapshotxx
+ Name[zh_TW]=KSnapshot 快照
+ Name[zu]=KEsincane isithombe
+ MimeType=
+--- kviewshell/kmultipage.cpp	(revision 484288)
++++ kviewshell/kmultipage.cpp	(revision 490050)
+@@ -68,8 +68,10 @@
+   // Create MarkList
+   _markList = new MarkList(sideBar, "marklist");
+   sideBar->addItem(_markList, QIconSet(SmallIcon("thumbnail")), i18n("Thumbnails"));
+-  sideBar->setCurrentItem(_markList);
+ 
++  // Restore state of the sidebar
++  sideBar->setCurrentItem(sideBar->item(KVSPrefs::sideBarItem()));
++
+   splitterWidget->setResizeMode(sideBar, QSplitter::KeepSize);
+ 
+   connect(_markList, SIGNAL(selected(const PageNumber&)), this, SLOT(gotoPage(const PageNumber&)));
+@@ -101,15 +103,29 @@
+ 
+ KMultiPage::~KMultiPage()
+ {
+-  KVSPrefs::setGuiLayout(splitterWidget->sizes());
+-  KVSPrefs::writeConfig();
++  writeSettings();
++
+   if (timer_id != -1)
+     killTimer(timer_id);
+ 
+   delete pageCache;
+ }
+ 
++void KMultiPage::readSettings()
++{
++}
+ 
++void KMultiPage::writeSettings()
++{
++  // Save TOC layout
++  tableOfContents->writeSettings();
++
++  KVSPrefs::setGuiLayout(splitterWidget->sizes());
++  // Save state of the sidebar
++  KVSPrefs::setSideBarItem(sideBar->indexOf(sideBar->currentItem()));
++  KVSPrefs::writeConfig();
++}
++
+ QString KMultiPage::name_of_current_file()
+ {
+   return m_file;
+--- kviewshell/kviewshell.kcfg	(revision 484288)
++++ kviewshell/kviewshell.kcfg	(revision 490050)
+@@ -72,6 +72,9 @@
+     </whatsthis>
+   </entry>
+   <entry key="GuiLayout" type="IntList" />
++  <entry key="SideBarItem" type="Int">
++    <default>1</default>
++  </entry>
+  </group>
+  <group name="Accessibility" >
+    <entry key="PaperColor" type="Color" >
+--- kviewshell/kmultipage.desktop	(revision 484288)
++++ kviewshell/kmultipage.desktop	(revision 490050)
+@@ -22,7 +22,6 @@
+ Name[sv]=Kviewshell flera sidor
+ Name[ta]=கேகாட்சிஓடு பலபக்கம்
+ Name[tr]=KViewShell ÇokluSayfa
+-Name[xx]=xxKViewShell MultiPagexx
+ Name[zh_CN]=KViewShell 多页
+ 
+ [PropertyDef::X-KDE-MimeTypes]
+--- kviewshell/plugins/djvu/djvurenderer.cpp	(revision 484288)
++++ kviewshell/plugins/djvu/djvurenderer.cpp	(revision 490050)
+@@ -663,7 +663,15 @@
+   }
+   
+   QMutexLocker locker( &mutex );
+- 
++  
++  G_TRY {
++    document->save_as(GURL::Filename::UTF8(filename.ascii()), true);
++  }
++  G_CATCH(ex) {
++    return false;
++  }
++  G_ENDCATCH;
++
+   document->save_as(GURL::Filename::UTF8(filename.ascii()), true);
+   
+   if (QFile::exists(filename) == false)
+--- kviewshell/plugins/djvu/djvumultipage.desktop	(revision 484288)
++++ kviewshell/plugins/djvu/djvumultipage.desktop	(revision 490050)
+@@ -1,9 +1,9 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=kdjview
++Name[hu]=KDjView
+ Name[ja]=Kdjview
+ Name[sv]=Kdjview
+-Name[xx]=xxkdjviewxx
+ Name[zh_CN]=KDjView
+ Icon=kdjview
+ Type=Service
+@@ -14,9 +14,12 @@
+ Comment[cs]=KViewShell modul pro DjVu soubory
+ Comment[da]=Kviewshell-plugin for DjVu-filer
+ Comment[de]=Ein KViewShell-Modul für DjVu-Dateien
++Comment[el]=Πρόσθετο του KViewShell για αρχεία DjVu
+ Comment[es]=Extensión KViewShell para archivos DjVu
+ Comment[et]=KView DjVu-failide plugin
++Comment[eu]=DjVu fitxategien KViewShell-en plugina
+ Comment[fr]=Module KViewShell pour les fichiers DjVu
++Comment[hu]=KViewShell-modul DjVu-fájlokhoz
+ Comment[is]=KViewShell íforrit fyrir DjVu skrár
+ Comment[it]=Plugin KViewShell per file DjVu
+ Comment[ja]=DjVu ファイル用の KViewShell プラグイン
+@@ -32,7 +35,6 @@
+ Comment[sv]=Kviewshell-insticksprogram för DjVu-filer
+ Comment[tr]=DjVu dosyaları için KViewShell eklentisi
+ Comment[uk]=Втулок перегляду файлів DjVu для KViewShell
+-Comment[xx]=xxKViewShell plugin for DjVu filesxx
+ Comment[zh_CN]=DjVu 文件的 KViewShell 插件
+ ServiceTypes=KViewShell/MultiPage
+ X-KDE-MimeTypes=image/x-djvu
+--- kviewshell/kmultipage.h	(revision 484288)
++++ kviewshell/kmultipage.h	(revision 490050)
+@@ -227,11 +227,11 @@
+    has actually been used. A default implementation is provided. */
+   virtual double setZoom(double z);
+   
+-  /* reads in settings */
+-  virtual void readSettings() {}
++  /** reads in settings. Reimplementations must call this. */
++  virtual void readSettings();
+   
+-  /* writes settings */
+-  virtual void writeSettings() {}
++  /** writes settings. Reimplementations must call this. */
++  virtual void writeSettings();
+   
+   /** Flag to indicate that this implementation has support for textserach and selection */
+   virtual bool supportsTextSearch() const { return getRenderer() && getRenderer()->supportsTextSearch(); }
+--- kviewshell/tableOfContents.cpp	(revision 484288)
++++ kviewshell/tableOfContents.cpp	(revision 490050)
+@@ -25,6 +25,7 @@
+ 
+ #include "tableOfContents.h"
+ #include "bookmark.h"
++#include "kvsprefs.h"
+ 
+ 
+ TocItem::TocItem(TocItem* parent)
+@@ -48,14 +49,30 @@
+   setRootIsDecorated(true);
+   setSelectionMode(QListView::NoSelection);
+   setResizeMode(AllColumns);
++  setColumnWidthMode(0, Manual);
++  setColumnWidthMode(1, Manual);
++  setFullWidth(true);
+ 
++  readSettings();
++
+   connect(this, SIGNAL(executed(QListViewItem*)), this, SLOT(itemClicked(QListViewItem*)));
+ }
+ 
+ TableOfContents::~TableOfContents()
+ {
++  writeSettings();
+ }
+ 
++void TableOfContents::writeSettings()
++{
++  saveLayout(KVSPrefs::self()->config(), "tocLayout");
++}
++
++void TableOfContents::readSettings()
++{
++  restoreLayout(KVSPrefs::self()->config(), "tocLayout");
++}
++
+ void TableOfContents::setContents(const QPtrList<Bookmark>& bookmarks)
+ {
+   clear();
+--- kviewshell/emptymultipage.desktop	(revision 484288)
++++ kviewshell/emptymultipage.desktop	(revision 490050)
+@@ -1,7 +1,6 @@
+ [Desktop Entry]
+ Type=Service
+ Comment=
+-Comment[xx]=xxxx
+ Name=EmptyMultiPage
+ Name[de]=Leere Mehrfachseite
+ Name[es]=Vaciado multipágina
+@@ -18,7 +17,6 @@
+ Name[sv]=Tom flera sidor
+ Name[ta]=காலியான பலபக்கம்
+ Name[tr]=BoşÇokluSayfa
+-Name[xx]=xxEmptyMultiPagexx
+ ServiceTypes=KViewShell/MultiPage
+ X-KDE-Library=emptymultipagepart
+ X-KDE-EmptyMultiPage=1
+--- kviewshell/tableOfContents.h	(revision 484288)
++++ kviewshell/tableOfContents.h	(revision 490050)
+@@ -53,6 +53,9 @@
+ 
+   void setContents(const QPtrList<Bookmark>& bookmarks);
+ 
++  void writeSettings();
++  void readSettings();
++
+ signals:
+   void gotoPage(const Anchor&);
+ 
+--- kviewshell/pageView.cpp	(revision 484288)
++++ kviewshell/pageView.cpp	(revision 490050)
+@@ -49,7 +49,7 @@
+   setDragAutoScroll(false);
+ 
+   enableClipper(true);
+-  nrCols = 2;
++  nrCols = 1;
+   nrRows = 1;
+   continuousViewmode = true;
+   fullScreen = false;
+--- kviewshell/kviewpart.cpp	(revision 484288)
++++ kviewshell/kviewpart.cpp	(revision 490050)
+@@ -1349,14 +1349,19 @@
+   // not need to take any action here, because this method is called
+   // only in the constructor of the KViewPart when no document is loaded.
+   useDocumentSpecifiedSize->setChecked(KVSPrefs::useDocumentSpecifiedSize());
++
++  multiPage->readSettings();
+ }
+ 
+ 
+ void KViewPart::writeSettings()
+ {
+   // if loading the KPart failed - just exit now
+-  if (!showSidebar)
+-    return;
++  //if (!showSidebar)
++  //  return;
++
++  multiPage->writeSettings();
++
+   KVSPrefs::setPageMarks(showSidebar->isChecked());
+   KVSPrefs::setWatchFile(watchAct->isChecked());
+   KVSPrefs::setZoom(_zoomVal.value());
+--- kmrml/kmrml/mrml.desktop	(revision 484288)
++++ kmrml/kmrml/mrml.desktop	(revision 490050)
+@@ -42,7 +42,6 @@
+ Comment[uk]=Документ формату зберігання мультимедія
+ Comment[ven]=Manwalwa a luambo lwau humbula zwa khasho nnzhi
+ Comment[xh]=Uxwebhu Lolwimi Lophawulo phezulu Lokufumana i Multimedia
+-Comment[xx]=xxMultimedia Retrieval Markup Language Documentxx
+ Comment[zh_CN]=多媒体检索标记语言文档
+ Comment[zh_TW]=多媒體補償標記語言文件
+ Comment[zu]=Ushicilelo Lwe-Multimedia Retrieval Markup Language 
+--- kmrml/kmrml/kcontrol/kcmkmrml.desktop	(revision 484288)
++++ kmrml/kmrml/kcontrol/kcmkmrml.desktop	(revision 490050)
+@@ -55,7 +55,6 @@
+ Name[ven]=Index ya tshifanyiso
+ Name[wa]=Indecse des imådjes
+ Name[xh]=Isalathisi Somfanekiso
+-Name[xx]=xxImage Indexxx
+ Name[zh_CN]=图像索引
+ Name[zh_TW]=影像索引
+ Name[zu]=Isiqalo Sesithombe
+@@ -86,7 +85,7 @@
+ Comment[nb]=Tilpass GNU bildesøkingsverktøy
+ Comment[nl]=Configuratie voor het gebruik van de GNU Image Finding Tool
+ Comment[nn]=Oppsett av GNU Image Finding Tool
+-Comment[pl]=Konfiguracja Gifta (narzędzia do szukania obrazów GNU)
++Comment[pl]=Konfiguracja Gifta (narzędzia do szukania obrazków GNU)
+ Comment[pt]=Configuração da Ferramenta de Procura de Imagens da GNU
+ Comment[pt_BR]=Configuração para o uso da Ferramenta de Procura de Imagens GNU
+ Comment[ro]=Configurare pentru GNU Image Finding Tool
+@@ -104,7 +103,6 @@
+ Comment[ven]=Nzudzanyo yau shumisa tshishumiswa tshau toda tshifanyiso tsha GNU
+ Comment[wa]=Apontiaedje po-z eployî l' usteye di cweraedje d' imådjes di GNU
+ Comment[xh]=Uqwalaselo lokusebenzisa Isixhobo Sokufumana Umfanekiso we GNU
+-Comment[xx]=xxConfiguration for using the GNU Image Finding Toolxx
+ Comment[zh_CN]=使用 GNU 图像查找工具的配置
+ Comment[zh_TW]= GNU 影像搜尋工具組態
+ Comment[zu]=Inhlanganiselo yokusebenzisa Ithuluzi Lokuthola Isithombe se-GNU
+@@ -135,7 +133,7 @@
+ Keywords[nl]=illustraties,figuren,figuur,afbeeldingen,plaatjes,zoeken,find,gift,kmrml,mrml,CBIR,images
+ Keywords[nn]=bilete,søk,spørjing,finn,gåve,kmrml,mrml,CBIR
+ Keywords[nso]=Diponagalo,Nyaka,Kgokgonego,Hwetsa,Mpho,kmrml,mrml,CBIR
+-Keywords[pl]=Obrazy,Szukanie,Zapytanie,Szukaj,Gift,kmrml,mrml,CBIR
++Keywords[pl]=Obrazki,Szukanie,Zapytanie,Szukaj,Gift,kmrml,mrml,CBIR
+ Keywords[pt]=Imagens,Procurar,Pesquisar,Encontrar,Prenda,kmrml,mrml,CBIR
+ Keywords[pt_BR]=Imagens,Busca,Consulta,Procurar,Presente,kmrml,mrml,CBIR
+ Keywords[ro]=imagini,căutare,caută,interogare,găseşte,dar,kmrml,mrml,CBIR
+@@ -152,7 +150,6 @@
+ Keywords[ven]=Zwifanyiso,Toda,Mbudziso,Wana,Mpho,kmrml,mrml,CBIR
+ Keywords[wa]=Imådjes,Cweri,Cweraedje,Trover,Gift,kmrml,mrml,CBIR
+ Keywords[xh]=Imifanekiso,Uphendlo,Ubuzo,fumana,Isiphiwo,kmrml,mrml,CBIR
+-Keywords[xx]=xxImages,Search,Query,Find,Gift,kmrml,mrml,CBIRxx
+ Keywords[zh_CN]=Images,Search,Query,Find,Gift,kmrml,mrml,CBIR,图像,搜索,查询,查找,礼物
+ Keywords[zh_TW]=Images,Search,Query,Find,Gift,kmrml,mrml,CBIR,影像,搜尋,查詢,尋找
+ Keywords[zu]=Izithombe,Funa,Buza,Thola,Isipho,kmrml,mrml,CBIR
+--- kmrml/kmrml/mrml-servicemenu.desktop	(revision 484288)
++++ kmrml/kmrml/mrml-servicemenu.desktop	(revision 490050)
+@@ -12,7 +12,7 @@
+ Name[cs]=Hledat podobný obrázek...
+ Name[cy]=Chwilio am Ddelweddau Tebyg...
+ Name[da]=Søg efter lignende filer...
+-Name[de]=Nach ähnlichen Bildern suchen...
++Name[de]=Nach ähnlichen Bildern suchen ...
+ Name[el]=Αναζήτηση για παρόμοιες εικόνες...
+ Name[es]=Búsqueda de imágenes similares...
+ Name[et]=Otsi sarnaseid pilte...
+@@ -31,7 +31,7 @@
+ Name[nl]=Zoeken naar vergelijkbare afbeeldingen...
+ Name[nn]=Søk etter liknande bilete ...
+ Name[nso]=Nyako ya Diponagalo tseo di Swanago...
+-Name[pl]=Szukaj podobnych obrazów
++Name[pl]=Szukaj podobnych obrazków
+ Name[pt]=Procurar por Imagens Semelhantes...
+ Name[pt_BR]=Procurar por Imagens Parecidas...
+ Name[ro]=Caută imagini similare...
+@@ -50,7 +50,6 @@
+ Name[ven]=Todani zwifanyiso zwielanaho...
+ Name[wa]=Cweri après des rshonnantès imådjes...
+ Name[xh]=Phendla Imifanekiso Efanayo...
+-Name[xx]=xxSearch for Similar Images...xx
+ Name[zh_CN]=搜索类似图像...
+ Name[zh_TW]=尋找類似的影像...
+ Name[zu]=Sesha ukuthola Izithombe Ezifanayo....
+--- kmrml/kmrml/mrml_part.desktop	(revision 484288)
++++ kmrml/kmrml/mrml_part.desktop	(revision 490050)
+@@ -43,7 +43,6 @@
+ Name[uk]=Перегляд MRML
+ Name[ven]=Mbonalelo ya MRML
+ Name[xh]=MRML Imbono
+-Name[xx]=xxMRML Viewxx
+ Name[zh_CN]=MRML 查看器
+ Name[zh_TW]=MRML 檢視器
+ Name[zu]=Umbukiso we-MRML
+--- kmrml/kmrml/server/daemonwatcher.desktop	(revision 484288)
++++ kmrml/kmrml/server/daemonwatcher.desktop	(revision 490050)
+@@ -41,7 +41,6 @@
+ Name[tg]=Мудири демони KDED KMRML
+ Name[tr]=KDED KMRML Aracı İzleyici
+ Name[uk]=Спостерігач демону KDED KMRML
+-Name[xx]=xxKDED KMRML Daemon Watcherxx
+ Name[zh_CN]=KDED KMRML 守护程序监视器
+ Comment=Starts daemons on demand and restarts them on failure
+ Comment[bg]=Стартиране на демоните при заявка и рестартиране на демони при грешка
+@@ -80,7 +79,6 @@
+ Comment[tg]=Оғози демон аз рӯи дархост ва ҳангоми нуқсони он аз сари нав оғоз намудан.
+ Comment[tr]=İstek halinde programı başlatır ve hata durumunda yeniden başlatır.
+ Comment[uk]=Запускає демони при потребі та перезапускає їх при аварії
+-Comment[xx]=xxStarts daemons on demand and restarts them on failurexx
+ Comment[zh_CN]=按需启动守护程序并在失败时重新启动
+ ServiceTypes=KDEDModule
+ X-KDE-ModuleType=Library
+--- kfax/kfax.desktop	(revision 484288)
++++ kfax/kfax.desktop	(revision 490050)
+@@ -53,7 +53,6 @@
+ GenericName[ven]=Muvhoni wa Fekisi
+ GenericName[wa]=Håyneu di facs
+ GenericName[xh]=Umboniseli Wefax
+-GenericName[xx]=xxFax Viewerxx
+ GenericName[zh_CN]=传真查看器
+ GenericName[zh_TW]=傳真檢視器
+ GenericName[zu]=Umbonisi wefax
+@@ -69,7 +68,6 @@
+ Name[th]=โทรสาร - K
+ Name[ven]=Fekisi ya K
+ Name[wa]=KFacs
+-Name[xx]=xxKFaxxx
+ Name[zh_TW]=KFax 傳真
+ Exec=kfax %f   -caption "%c" %i %m
+ Icon=kfax
+--- kghostview/kgvdocument.cpp	(revision 484288)
++++ kghostview/kgvdocument.cpp	(revision 490050)
+@@ -567,8 +567,9 @@
+                           QString::null );
+     if( !KIO::NetAccess::upload( _fileName,
+ 				 saveURL,
+-				 static_cast<QWidget*>( 0 ) ) )
+-	; // TODO: Proper error dialog
++				 static_cast<QWidget*>( 0 ) ) ) {
++	// TODO: Proper error dialog
++    }
+ }
+ 
+ bool KGVDocument::savePages( const QString& saveFileName,
+--- kghostview/kghostview.desktop	(revision 484288)
++++ kghostview/kghostview.desktop	(revision 490050)
+@@ -12,7 +12,6 @@
+ Name[tr]=GhostView
+ Name[ven]=Mbonalelo ya tshipuku tsha K
+ Name[xh]=Imboniselo yeKGhost
+-Name[xx]=xxKGhostViewxx
+ MimeType=application/pdf;application/postscript;image/x-eps;application/x-gzpostscript;application/illustrator
+ InitialPreference=6
+ Exec=kghostview %u -caption "%c" %i %m
+@@ -73,7 +72,6 @@
+ GenericName[ven]=Muvhoni wa PS/PDF
+ GenericName[wa]=Håyneu di documints PS/PDF
+ GenericName[xh]=Umboniseli we PS/PDF
+-GenericName[xx]=xxPS/PDF Viewerxx
+ GenericName[zh_CN]=PS/PDF 查看器
+ GenericName[zh_TW]=PS/PDF 檢視器
+ GenericName[zu]=Umboniseli we PS/PDF
+--- kamera/kcontrol/kamera.desktop	(revision 484288)
++++ kamera/kcontrol/kamera.desktop	(revision 490050)
+@@ -16,7 +16,7 @@
+ Comment[eo]=Agordu fotilon
+ Comment[es]=Configura Kamera
+ Comment[et]=Kaamera seadistamine
+-Comment[eu]=Konfigure Kamera
++Comment[eu]=Konfiguratu Kamera
+ Comment[fi]=Kameran asetukset
+ Comment[fr]=Configuration de Kamera
+ Comment[ga]=Cumraigh Kamera
+@@ -57,7 +57,6 @@
+ Comment[uz]=Фотоапаратни мослаш
+ Comment[ven]=Dzudzanya kamera
+ Comment[xh]=Qwalasela Umfoti
+-Comment[xx]=xxConfigure Kameraxx
+ Comment[zh_CN]=配置 Kamera
+ Comment[zh_TW]=設定照相機
+ Comment[zu]=Hlanganisa ikhamera
+@@ -104,7 +103,6 @@
+ Keywords[uk]=gphoto,камера,цифрова камера,камера Тенет,kamera
+ Keywords[ven]=Tshinepe tsha g,Tshaudzhia zwifanyiso,digicam,webcam,Tshaudzhiazwifanyiso
+ Keywords[xh]=gphoto,umfoti,digicam,webcam,umfoti
+-Keywords[xx]=xxgphoto,camera,digicam,webcam,kameraxx
+ Keywords[zh_CN]=gphoto,camera,digicam,webcam,kamera,照相机,数码相机,摄像头
+ Keywords[zh_TW]=gphoto,camera,digicam,webcam,kamera,照相機
+ Keywords[zu]=gphoto,ikhamera,digicam,webcam,ikhamera
+@@ -164,7 +162,6 @@
+ Name[uz]=Фотоапарат
+ Name[ven]=Tshau dzhia zwifanyiso tsha didzhithala
+ Name[xh]=Ikhamera Yesuntswana
+-Name[xx]=xxDigital Cameraxx
+ Name[zh_CN]=数码相机
+ Name[zh_TW]=數位相機
+ Name[zu]=Ikhamera ebonisa inani ngalinye
+--- kruler/eventsrc	(revision 484288)
++++ kruler/eventsrc	(revision 490050)
+@@ -54,7 +54,6 @@
+ Comment[uz]=KDE экран линейкаси
+ Comment[ven]=Muvhusi wa tshikirini tsha KDE
+ Comment[xh]=Umlawuli wekhusi le KDE
+-Comment[xx]=xxKDE Screen Rulerxx
+ Comment[zh_CN]=KDE 屏幕标尺
+ Comment[zh_TW]=KDE 螢幕丈量尺
+ Comment[zu]=Umlawuli Wesikrini se KDE
+@@ -111,7 +110,6 @@
+ Name[uk]=Пересунуто клавішами курсора
+ Name[ven]=Tshimbidzhwa nga khii ya musevhe
+ Name[xh]=Ishukunyiswa zizitshixo zesalathisi
+-Name[xx]=xxMoved by Cursor Keysxx
+ Name[zh_CN]=用光标键移动
+ Name[zh_TW]=用游標鍵移動
+ Name[zu]=Inyakaziswe Izikhiye Ze Cursor
+@@ -165,7 +163,6 @@
+ Comment[uk]=Лінійка пересувається по пікселях за допомогою клавіш курсора
+ Comment[ven]=Muvhusi o sudzulusa pixelwise a tshi khou shumisa khii ya Cursor
+ Comment[xh]=Umlawuli ushukume jikelele kwipixel esebenzisa izitshixi zesalathisi
+-Comment[xx]=xxThe ruler has moved pixelwise using the cursor keysxx
+ Comment[zh_CN]=标尺已经用光标键按像素移动
+ Comment[zh_TW]=使用游標鍵移動尺規單一個像素
+ Comment[zu]=Umlawuli unyakazise jikelele kwipixel esebenzisa izikhiye ze cursor
+--- kruler/kruler.desktop	(revision 484288)
++++ kruler/kruler.desktop	(revision 490050)
+@@ -48,7 +48,6 @@
+ GenericName[uk]=Лінійка екрана
+ GenericName[uz]=Экран линейкаси
+ GenericName[ven]=Muvhusi wa Tshikirini
+-GenericName[xx]=xxScreen Rulerxx
+ GenericName[zh_CN]=屏幕标尺
+ GenericName[zh_TW]=螢幕丈量尺
+ GenericName[zu]=Umlawuli Wesikrini
+@@ -68,7 +67,6 @@
+ Name[ta]=கேவரை உருளை
+ Name[th]=ไม้บรรทัด - K
+ Name[ven]=Muvhusi wa K
+-Name[xx]=xxKRulerxx
+ Name[zu]=KUmlawuli
+ DocPath=kruler/index.html
+ MimeType=
+--- kiconedit/kiconedit.desktop	(revision 484288)
++++ kiconedit/kiconedit.desktop	(revision 490050)
+@@ -56,7 +56,6 @@
+ GenericName[ven]=Musengulusi wa Aikhono
+ GenericName[wa]=Aspougneu d' imådjetes
+ GenericName[xh]=Umhleli we Icon
+-GenericName[xx]=xxIcon Editorxx
+ GenericName[zh_CN]=图标编辑器
+ GenericName[zh_TW]=圖示編輯器
+ GenericName[zu]=Umhleli we Icon
+@@ -77,7 +76,6 @@
+ Name[th]=แก้ไขไอคอน - K
+ Name[tr]=K Icon Düzenleyici
+ Name[ven]=U sengulusa ha aikhono ya K
+-Name[xx]=xxKIconEditxx
+ Name[zh_TW]=圖示編輯器
+ MimeType=image/x-xpm;image/x-ico;image/png;image/jpeg;
+ Exec=kiconedit -caption "%c" %i %m %u
+--- kfile-plugins/ps/kfile_ps.desktop	(revision 484288)
++++ kfile-plugins/ps/kfile_ps.desktop	(revision 490050)
+@@ -50,7 +50,6 @@
+ Name[ven]=Mafhungo a mabammbiri a poso
+ Name[wa]=Informåcion sol documint PostScript
+ Name[xh]=Ulwazi Lwe PostScript
+-Name[xx]=xxPostScript Infoxx
+ Name[zh_CN]=PostScript 信息
+ Name[zh_TW]=PostScript 資訊
+ Name[zu]=Ulwazi Lwesi-PostScript
+--- kfile-plugins/ps/gsthumbnail.desktop	(revision 484288)
++++ kfile-plugins/ps/gsthumbnail.desktop	(revision 490050)
+@@ -43,7 +43,6 @@
+ Name[tr]=PostScript, PDF ve DVI Dosyaları
+ Name[uk]=Файли PostScript, PDF та DVI
+ Name[uz]=PostScript, PDF ва DVI файллари
+-Name[xx]=xxPostScript, PDF and DVI Filesxx
+ Name[zh_CN]=PostScript、PDF 和 DVI 文件
+ ServiceTypes=ThumbCreator
+ MimeTypes=application/x-dvi,application/postscript,application/pdf,image/x-eps
+--- kfile-plugins/dvi/kfile_dvi.desktop	(revision 484288)
++++ kfile-plugins/dvi/kfile_dvi.desktop	(revision 490050)
+@@ -43,7 +43,6 @@
+ Name[uk]=Інформація по DVI
+ Name[uz]=DVI ҳақида маълумот
+ Name[wa]=Informåcion sol documint DVI
+-Name[xx]=xxDVI Infoxx
+ Name[zh_CN]=DVI 信息
+ ServiceTypes=KFilePlugin
+ Type=Service
+--- kfile-plugins/png/kfile_png.desktop	(revision 484288)
++++ kfile-plugins/png/kfile_png.desktop	(revision 490050)
+@@ -48,7 +48,6 @@
+ Name[ven]=Mafhungo a PNG
+ Name[wa]=Informåcion sol imådje PNG
+ Name[xh]=PNG Ulwazi
+-Name[xx]=xxPNG Infoxx
+ Name[zh_CN]=PNG 信息
+ Name[zh_TW]=PNG 資訊
+ Name[zu]=Ulwazi lwe-PNG
+--- kfile-plugins/jpeg/kfile_jpeg.desktop	(revision 484288)
++++ kfile-plugins/jpeg/kfile_jpeg.desktop	(revision 490050)
+@@ -46,7 +46,6 @@
+ Name[ven]=Mafhungo a JPEG EXIF
+ Name[wa]=Informåcion sol imådje JPEG EXIF
+ Name[xh]=Ulwazi lwe JPEG EXIF
+-Name[xx]=xxJPEG EXIF Infoxx
+ Name[zh_CN]=JPEG EXIF 信息
+ Name[zh_TW]=JPEG EXIF 資訊
+ Name[zu]=Ulwazi lwe-JPEG EXIF
+--- kfile-plugins/xbm/kfile_xbm.desktop	(revision 484288)
++++ kfile-plugins/xbm/kfile_xbm.desktop	(revision 490050)
+@@ -47,7 +47,6 @@
+ Name[ven]=Mafhungo a XBM
+ Name[wa]=Informåcion sol imådje XBM
+ Name[xh]=Ulwazi lwe XBM
+-Name[xx]=xxXBM Infoxx
+ Name[zh_CN]=XBM 信息
+ Name[zh_TW]=XBM 資訊
+ Name[zu]=Ulwazi lwe-XBM
+--- kfile-plugins/tiff/kfile_tiff.desktop	(revision 484288)
++++ kfile-plugins/tiff/kfile_tiff.desktop	(revision 490050)
+@@ -49,7 +49,6 @@
+ Name[ven]=Mafhungo a Meta faela ya TIFF
+ Name[wa]=Informåcion sol imådje TIFF
+ Name[xh]=Ulwazi lwe TIFF Ifayile Esembindini
+-Name[xx]=xxTIFF File Meta Infoxx
+ Name[zh_CN]=TIFF 文件元信息
+ Name[zh_TW]=TIFF 檔案 Meta 資訊
+ Name[zu]=Ulwazi Lwefayela yemeta ye-TIFF
+--- kfile-plugins/raw/x-image-raw.desktop	(revision 484288)
++++ kfile-plugins/raw/x-image-raw.desktop	(revision 490050)
+@@ -10,10 +10,13 @@
+ Comment[cs]=RAW soubor
+ Comment[da]=RAW kamera-fil
+ Comment[de]=RAW Kamera-Datei
++Comment[el]=RAW αρχείο κάμερας
+ Comment[es]=Archivo RAW de cámara
+ Comment[et]=Toores kaamerafail (RAW)
++Comment[eu]=RAW kamera-fitxategiak
+ Comment[fr]=Fichiers brut d'appareil photo numériques
+ Comment[ga]=Comhad Ceamara RAW
++Comment[hu]=RAW-fájl
+ Comment[is]=RAW myndavélaskrá
+ Comment[it]=File grezzi fotocamera digitale
+ Comment[ja]=RAW カメラファイル
+@@ -29,5 +32,4 @@
+ Comment[sv]=Obehandlad kamerafil
+ Comment[tr]=RAW Kamera Dosyası
+ Comment[uk]=Файл цифрової камери RAW
+-Comment[xx]=xxRAW Camera Filexx
+ Comment[zh_CN]=RAW 相机文件
+--- kfile-plugins/raw/kfile_raw.desktop	(revision 484288)
++++ kfile-plugins/raw/kfile_raw.desktop	(revision 490050)
+@@ -10,8 +10,10 @@
+ Name[el]=RAW αρχείο κάμερας
+ Name[es]=Archivos RAW de cámara
+ Name[et]=Toored kaamerafailid
++Name[eu]=RAW kamera-fitxategiak
+ Name[fr]=Fichiers bruts d'appareil photo numériques
+ Name[ga]=Comhaid Cheamara RAW
++Name[hu]=RAW-fájlok
+ Name[is]=RAW myndavélaskrár
+ Name[it]=File grezzi fotocamera digitale
+ Name[ja]=RAW カメラファイル
+@@ -27,7 +29,6 @@
+ Name[sv]=Obehandlade kamerafiler
+ Name[tr]=RAW Kamera Dosyaları
+ Name[uk]=Файли цифрової камери RAW
+-Name[xx]=xxRAW Camera Filesxx
+ Name[zh_CN]=RAW 相机文件
+ ServiceTypes=KFilePlugin
+ MimeType=image/x-raw
+--- kfile-plugins/pnm/kfile_pnm.desktop	(revision 484288)
++++ kfile-plugins/pnm/kfile_pnm.desktop	(revision 490050)
+@@ -43,7 +43,6 @@
+ Name[uk]=Інформація про PNM
+ Name[uz]=PNM ҳақида маълумот
+ Name[wa]=Informåcion sol imådje PNM
+-Name[xx]=xxPNM Infoxx
+ Name[zh_CN]=PNM 信息
+ ServiceTypes=KFilePlugin
+ X-KDE-Library=kfile_pnm
+--- kfile-plugins/pcx/kfile_pcx.desktop	(revision 484288)
++++ kfile-plugins/pcx/kfile_pcx.desktop	(revision 490050)
+@@ -44,7 +44,6 @@
+ Name[uk]=Мета-інформація про файл PCX
+ Name[uz]=PCX-файлининг мета-маълумоти
+ Name[wa]=Informåcion sol imådje PCX
+-Name[xx]=xxPCX File Meta Infoxx
+ Name[zh_CN]=PCX 文件元信息
+ ServiceTypes=KFilePlugin
+ X-KDE-Library=kfile_pcx
+--- kfile-plugins/exr/kfile_exr.desktop	(revision 484288)
++++ kfile-plugins/exr/kfile_exr.desktop	(revision 490050)
+@@ -39,7 +39,6 @@
+ Name[tr]=EXR Bilgisi
+ Name[uk]=Інформація по EXR
+ Name[uz]=EXR ҳақида маълумот
+-Name[xx]=xxEXR Infoxx
+ Name[zh_CN]=EXR 信息
+ ServiceTypes=KFilePlugin
+ X-KDE-Library=kfile_exr
+--- kfile-plugins/xpm/kfile_xpm.desktop	(revision 484288)
++++ kfile-plugins/xpm/kfile_xpm.desktop	(revision 490050)
+@@ -33,7 +33,6 @@
+ Name[tr]=XPM Bilgisi
+ Name[uk]=Інформація про XPM
+ Name[uz]=XPM ҳақида маълумот
+-Name[xx]=xxXPM Infoxx
+ Name[zh_CN]=XPM 信息
+ ServiceTypes=KFilePlugin
+ X-KDE-Library=kfile_xpm
+--- kfile-plugins/gif/kfile_gif.desktop	(revision 484288)
++++ kfile-plugins/gif/kfile_gif.desktop	(revision 490050)
+@@ -48,7 +48,6 @@
+ Name[ven]=Mafhungo a GIF
+ Name[wa]=Informåcion sol imådje GIF
+ Name[xh]=Ulwazi lwe GIF
+-Name[xx]=xxGIF Infoxx
+ Name[zh_CN]=GIF 信息
+ Name[zh_TW]=GIF 資訊
+ Name[zu]=Ulwazi lwe-GIF
+--- kfile-plugins/pdf/kfile_pdf.desktop	(revision 484288)
++++ kfile-plugins/pdf/kfile_pdf.desktop	(revision 490050)
+@@ -48,7 +48,6 @@
+ Name[ven]=Mafhungo a PDF
+ Name[wa]=Informåcion sol documint PDF
+ Name[xh]=PDF Ulwazi
+-Name[xx]=xxPDF Infoxx
+ Name[zh_CN]=PDF 信息
+ Name[zh_TW]=PDF 資訊
+ Name[zu]=Ulwazi lwe-PDF
+--- kfile-plugins/ico/kfile_ico.desktop	(revision 484288)
++++ kfile-plugins/ico/kfile_ico.desktop	(revision 490050)
+@@ -47,7 +47,6 @@
+ Name[ven]=Mafhungo a ICO
+ Name[wa]=Informåcion sol imådjete ICO
+ Name[xh]=Ulwazi lwe ICO
+-Name[xx]=xxICO Infoxx
+ Name[zh_CN]=ICO 信息
+ Name[zh_TW]=ICO 資訊
+ Name[zu]=Ulwazi lwe-ICO
+--- kfile-plugins/dds/kfile_dds.desktop	(revision 484288)
++++ kfile-plugins/dds/kfile_dds.desktop	(revision 490050)
+@@ -33,7 +33,6 @@
+ Name[ta]=நேரடி மேற்பரப்பு தகவல்
+ Name[tr]=DirectDraw Yüzey Bilgisi
+ Name[uk]=Інформація про поверхню DirectDraw
+-Name[xx]=xxDirectDraw Surface Infoxx
+ Name[zh_CN]=DirectDraw 表面信息
+ ServiceTypes=KFilePlugin
+ X-KDE-Library=kfile_dds
+--- kfile-plugins/rgb/kfile_rgb.desktop	(revision 484288)
++++ kfile-plugins/rgb/kfile_rgb.desktop	(revision 490050)
+@@ -45,7 +45,6 @@
+ Name[tr]=SGI Resmi(KYM)
+ Name[uk]=Зображення SGI (RGB)
+ Name[uz]=SGI-расм (RGB)
+-Name[xx]=xxSGI Image (RGB)xx
+ Name[zh_CN]=SGI 图像(RGB)
+ ServiceTypes=KFilePlugin
+ X-KDE-Library=kfile_rgb
+--- kfile-plugins/tga/kfile_tga.desktop	(revision 484288)
++++ kfile-plugins/tga/kfile_tga.desktop	(revision 490050)
+@@ -46,7 +46,6 @@
+ Name[ven]=Mafhungo a Targa ya mbonalelo ya vhukuma
+ Name[wa]=Informåcion sol imådje Truevision Targa
+ Name[xh]=Ulwazi lwe Truevision Targa
+-Name[xx]=xxTruevision Targa Infoxx
+ Name[zh_CN]=Truevision Targa 信息
+ Name[zh_TW]=Truevision Targa 資訊
+ Name[zu]=Ulwazi lwe-Truevision Targa
+--- kfile-plugins/bmp/kfile_bmp.desktop	(revision 484288)
++++ kfile-plugins/bmp/kfile_bmp.desktop	(revision 490050)
+@@ -48,7 +48,6 @@
+ Name[ven]=Mafhungo BMP
+ Name[wa]=Informåcion sol imådje BMP
+ Name[xh]=Ulwazi lwe BMP
+-Name[xx]=xxBMP Infoxx
+ Name[zh_CN]=BMP 信息
+ Name[zh_TW]=BMP 資訊
+ Name[zu]=Ulwazi lwe-BMP




More information about the pkg-kde-commits mailing list