[pkg-kde-commits] rev 2764 - in trunk/packages/kdegraphics/debian: . patches

Isaac Clerencia isaac at costa.debian.org
Sat Jan 7 17:45:25 UTC 2006


Author: isaac
Date: 2006-01-07 17:45:25 +0000 (Sat, 07 Jan 2006)
New Revision: 2764

Added:
   trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r494959.diff
Modified:
   trunk/packages/kdegraphics/debian/changelog
Log:
Upload to unstable


Modified: trunk/packages/kdegraphics/debian/changelog
===================================================================
--- trunk/packages/kdegraphics/debian/changelog	2006-01-07 17:38:22 UTC (rev 2763)
+++ trunk/packages/kdegraphics/debian/changelog	2006-01-07 17:45:25 UTC (rev 2764)
@@ -1,3 +1,11 @@
+kdegraphics (4:3.5.0-3) unstable; urgency=low
+
+  * Upload to unstable 
+
+  * KDE_3_5_BRANCH update (up to r494959)
+
+ -- Isaac Clerencia <isaac at debian.org>  Fri,  6 Jan 2006 18:24:53 +0100
+
 kdegraphics (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.

Added: trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r494959.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r494959.diff	2006-01-07 17:38:22 UTC (rev 2763)
+++ trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r494959.diff	2006-01-07 17:45:25 UTC (rev 2764)
@@ -0,0 +1,2069 @@
+#DPATCHLEVEL=0
+--- kpdf/xpdf/xpdf/DCTStream.cc	(revision 490050)
++++ kpdf/xpdf/xpdf/DCTStream.cc	(revision 494959)
+@@ -14,19 +14,25 @@
+ 
+ static boolean str_fill_input_buffer(j_decompress_ptr cinfo)
+ {
++  int c;
+   struct str_src_mgr * src = (struct str_src_mgr *)cinfo->src;
+   if (src->index == 0) {
+-    src->buffer = 0xFF;
++    c = 0xFF;
+     src->index++;
+   }
+   else if (src->index == 1) {
+-    src->buffer = 0xD8;
++    c = 0xD8;
+     src->index++;
+   }
+-  else src->buffer = src->str->getChar();
+-  src->pub.next_input_byte = &src->buffer;
+-  src->pub.bytes_in_buffer = 1;
+-  return TRUE;
++  else c = src->str->getChar();
++  if (c != EOF)
++  {
++    src->buffer = c;
++    src->pub.next_input_byte = &src->buffer;
++    src->pub.bytes_in_buffer = 1;
++    return TRUE;
++  }
++  else return FALSE;
+ }
+ 
+ static void str_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
+@@ -81,18 +87,17 @@
+   // the start marker...
+   bool startFound = false;
+   int c = 0, c2 = 0;
+-  int n = 0;
+   while (!startFound)
+   {
+     if (!c)
+     {
+       c = str->getChar();
+-      if (c != 0xFF) c = 0;
+       if (c == -1)
+       {
+         error(-1, "Could not find start of jpeg data");
+         exit(1);
+       }
++      if (c != 0xFF) c = 0;
+     }
+     else
+     {
+@@ -104,7 +109,6 @@
+       }
+       else startFound = true;
+     }
+-    n++;
+   }
+ 
+   jpeg_read_header(&cinfo, TRUE);
+@@ -119,7 +123,9 @@
+ 
+   if (x == 0) {
+     if (cinfo.output_scanline < cinfo.output_height)
+-      jpeg_read_scanlines(&cinfo, row_buffer, 1);
++    {
++      if (!jpeg_read_scanlines(&cinfo, row_buffer, 1)) return EOF;
++    }
+     else return EOF;
+   }
+   c = row_buffer[0][x];
+--- kpdf/shell/shell.cpp	(revision 490050)
++++ kpdf/shell/shell.cpp	(revision 494959)
+@@ -132,31 +132,6 @@
+     KGlobal::config()->setDesktopGroup();
+     bool fullScreen = KGlobal::config()->readBoolEntry( "FullScreen", false );
+     setFullScreen( fullScreen );
+-
+-    // necessary to make fullscreen mode obey the last showmenubar /  showtoolbarsettings
+-    KGlobal::config()->setGroup("MainWindow");
+-    if (KGlobal::config()->readBoolEntry( "MenuBar", true ))
+-    {
+-      m_showMenuBarAction->setChecked(true);
+-      menuBar()->show();
+-    }
+-    else
+-    {
+-      m_showMenuBarAction->setChecked(false);
+-      menuBar()->hide();
+-    }
+-
+-    KGlobal::config()->setGroup("MainWindow Toolbar mainToolBar");
+-    if (KGlobal::config()->readBoolEntry("Hidden", false))
+-    {
+-      m_showToolBarAction->setChecked(true);
+-      toolBar()->hide();
+-    }
+-    else
+-    {
+-      m_showToolBarAction->setChecked(false);
+-      toolBar()->show();
+-    }
+ }
+ 
+ void Shell::writeSettings()
+--- kview/kimageviewer/kimageviewercanvas.desktop	(revision 490050)
++++ kview/kimageviewer/kimageviewercanvas.desktop	(revision 494959)
+@@ -11,7 +11,7 @@
+ Comment[cy]=Cynfas Mewnadeiladadwy Gwelydd Delweddau (celfigyn sy'n dangos delwedd)
+ Comment[da]=Indlejrbar billedviserlærred (kontrol der viser et billede)
+ Comment[de]=Einbettungsfähiges Bildbetrachtermodul (Bildschirmausschnitt, der ein Bild anzeigt)
+-Comment[el]=Ενσωματώσμος Καμβάς Προβολής Εικόνων (γραφικό συστατικό που εμφανίζει μία εικόνα)
++Comment[el]=Ενσωματώσιμος Καμβάς Προβολής Εικόνων (γραφικό συστατικό που εμφανίζει μία εικόνα)
+ Comment[eo]=Enkonstruebla bildrigardilo kromaĵo
+ Comment[es]=Componente empotrable para visualizar lienzos (widget que muestra una imagen)
+ Comment[et]=Põimitavad pildifailide näitaja lõuendid (element, mis näitab pilti)
+--- doc/kview/index.docbook	(revision 490050)
++++ doc/kview/index.docbook	(revision 494959)
+@@ -16,8 +16,7 @@
+ <firstname>Hauke</firstname>
+ <surname>Hildebrandt</surname>
+ <affiliation>
+-<address><email>hauke.hildebrandt at iup.uni-heidelberg.de</email></address>
+-
++<address>&Hauke.Hildebrandt.mail;</address>
+ </affiliation>
+ </author>
+ 
+@@ -31,7 +30,7 @@
+ <othercredit role="reviewer">
+ <firstname>Lauri</firstname>
+ <surname>Watts</surname>
+-<affiliation><address><email>lauri at kde.org</email></address></affiliation>
++<affiliation><address>&Lauri.Watts.mail;</address></affiliation>
+ <contrib>Reviewer</contrib>
+ </othercredit>
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+@@ -40,13 +39,13 @@
+ 
+ <copyright>
+ <year>2001</year>
+-<holder>Hauke Hildebrandt</holder>
++<holder>&Hauke.Hildebrandt;</holder>
+ </copyright>
+ 
+ <legalnotice>&FDLNotice;</legalnotice>
+ 
+-<date>2005-05-07</date>
+-<releaseinfo>3.4.89</releaseinfo>
++<date>2005-12-10</date>
++<releaseinfo>3.5.0</releaseinfo>
+ 
+ <abstract><para>&kview; is an image viewing program. It is small and fast and
+ has some simple image processing commands. You can work with many different
+@@ -79,9 +78,8 @@
+ 
+ </chapter>
+ 
+-<chapter id="commands">
+-<title>Command Reference</title>
+-<para></para>
++<chapter id="menus">
++<title>Menu Reference</title>
+ 
+ <para>When you start &kview; you see the typical application layout: a
+ workspace containing your documents (images in this case), a menubar that
+@@ -102,7 +100,7 @@
+ <keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo>
+ </shortcut>
+ <guimenu>File</guimenu>
+-<guimenuitem>Open</guimenuitem>
++<guimenuitem>Open...</guimenuitem>
+ </menuchoice></term>
+ <listitem><para><action>Opens a new image</action> in &kview;. The size of the
+ &kview; main window and the image after loading are determined by your
+@@ -253,7 +251,7 @@
+ <guimenu>Edit</guimenu>
+ <guimenuitem>Rotate Counter-Clockwise</guimenuitem>
+ </menuchoice></term>
+-<listitem><para><action>Rotates the image by 90=B0 in the counter-clockwise
++<listitem><para><action>Rotates the image by 90° in the counter-clockwise
+ direction</action>.</para></listitem>
+ </varlistentry>
+ 
+@@ -262,7 +260,7 @@
+ <guimenu>Edit</guimenu>
+ <guimenuitem>Rotate Clockwise</guimenuitem>
+ </menuchoice></term>
+-<listitem><para><action>Rotates the image by 90=B0 in the clockwise
++<listitem><para><action>Rotates the image by 90° in the clockwise
+ direction</action>.</para></listitem>
+ </varlistentry>
+ </variablelist>
+@@ -375,7 +373,7 @@
+ <guibutton>Start Slideshow</guibutton> will start the slideshow with the current
+ settings for the interval. In addition, you can save and load your image
+ list using the corresponding buttons.
+-<guilabel>Slideshow interval</guilabel> <!--is guilabel correct? -->
++<guilabel>Slideshow interval:</guilabel> <!--is guilabel correct? -->
+ Here you can change the interval between the different slides for the slideshow.</para></listitem>
+ </varlistentry>
+ 
+@@ -482,17 +480,9 @@
+ <varlistentry>
+ <term><menuchoice>
+ <guimenu>Settings</guimenu>
+-<guimenuitem>Show/Hide Toolbar</guimenuitem>
+-</menuchoice></term>
+-<listitem><para><action>Toggles the toolbar on/off.</action></para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><menuchoice>
+-<guimenu>Settings</guimenu>
+ <guimenuitem>Show/Hide Statusbar</guimenuitem>
+ </menuchoice></term>
+-<listitem><para><action>Toggles the statusbar on/off.</action></para></listitem>
++<listitem><para><action>Toggles the status bar on/off.</action></para></listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+@@ -506,12 +496,12 @@
+ <varlistentry>
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;
+ <keycap>Shift</keycap><keycap>F</keycap></keycombo></shortcut>
+-<guimenu>Edit</guimenu>
++<guimenu>Settings</guimenu>
+ <guimenuitem>Fullscreen Mode</guimenuitem></menuchoice>
+ </term>
+ <listitem>
+ <para>This option maximizes the &kview; window and the currently shown image so
+-you can have a closer look at it. Even the window decorations (titlebar etc) are
++you can have a closer look at it. Even the window decorations (titlebar &etc;) are
+ temporarily removed. Selecting this option once again switches back to normal
+ mode.</para> 
+ </listitem>
+@@ -540,7 +530,7 @@
+ <varlistentry>
+ <term><menuchoice>
+ <guimenu>Settings</guimenu>
+-<guimenuitem>Configure KView...</guimenuitem>
++<guimenuitem>Configure &kview;...</guimenuitem>
+ </menuchoice></term>
+ <listitem><para><action>Opens a dialog for changing some options</action> as
+ described in the section <xref linkend="kview-options"/></para>
+@@ -549,16 +539,76 @@
+ </variablelist>
+ </sect1>
+ 
+-<sect1 id="kview-options">
++<sect1 id="help-menu">
++<title>The <guimenu>Help</guimenu> Menu</title>
++
++&help.menu.documentation;
++
++</sect1>
++</chapter>
++
++<chapter id="command-line">
++<title>Command Line Options</title>
++
++<para>&kview; can be started directly from a terminal like &konsole; or
++<application>xterm</application>. Several command line options are
++available.</para>
++
++<variablelist>
++<varlistentry>
++<term><command>kview</command> <option>--help</option></term>
++<listitem><para>Lists the command line options (see below).</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><command>kview</command> <option>--help-qt</option></term>
++<listitem><para>Shows the options specific to &Qt; (the &GUI;
++library that &kde; is based on).</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><command>kview</command> <option>--help-kde</option></term>
++<listitem><para>Shows the &kde;-specific options.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><command>kview</command> <option>--help-all</option></term>
++<listitem><para>Displays all command line options.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><command>kview</command> <option>--author</option></term>
++<listitem><para>You want to send your warm wishes and euphoric cheers to
++someone? Here they are!</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><command>kview</command> <option>-v</option>,
++<option>--version</option></term>
++<listitem><para>Displays the version number of &kview; (and that of
++&Qt;/&kde;).</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><command>kview</command> <option>--license</option></term>
++<listitem><para>Shows under which licenses &kview; is being
++published.</para></listitem>
++</varlistentry>
++</variablelist>
++</chapter>
++
++<chapter id="kview-options">
+ <title>&kview; Options</title>
+ 
+-<sect2 id="kview-options-viewer">
++<sect1 id="kview-options-viewer">
+ <title><guilabel>Viewer</guilabel></title>
+ 
+ <para>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).</para>
+ 
++<screenshot>
++<screeninfo>&kview; viewer configuration dialog</screeninfo>
++<mediaobject>
++<imageobject><imagedata fileref="kview-viewer-configuration.png" format="PNG"/></imageobject>
++<textobject><phrase>&kview; viewer configuration dialog</phrase></textobject>
++</mediaobject>
++</screenshot>
++
+ <variablelist>
+ <title>General configuration options for KViewCanvas</title>
+ <varlistentry>
+@@ -595,7 +645,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guilabel>Minimum width</guilabel></term>
++<term><guilabel>Minimum width:</guilabel></term>
+ <listitem>
+ <para>The width of the image shown will not get smaller than the size you
+ enter here. A value of 10 would cause a 1x1 image to be stretched
+@@ -604,7 +654,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guilabel>Maximum width</guilabel></term>
++<term><guilabel>Maximum width:</guilabel></term>
+ <listitem>
+ <para>The width of the image shown will not get bigger than the size you
+ enter here. A value of 100 would cause a 1000x1000 image to be compressed
+@@ -613,7 +663,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guilabel>Minimum height</guilabel></term>
++<term><guilabel>Minimum height:</guilabel></term>
+ <listitem>
+ <para>The height of the image shown will not get smaller than the size you
+ enter here. A value of 10 would cause a 1x1 image to be stretched vertically
+@@ -622,7 +672,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guilabel>Maximum height</guilabel></term>
++<term><guilabel>Maximum height:</guilabel></term>
+ <listitem>
+ <para>The height of the image shown will not get bigger than the size you
+ enter here. A value of 100 would cause a 1000x1000 image to be compressed
+@@ -631,7 +681,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guilabel>Choose which blend effects should be used</guilabel></term>
++<term><guilabel>Choose which blend effects should be used:</guilabel></term>
+ <listitem>
+ <para>Every effect selected may be used to create a transition effect
+ between the images. If you select multiple effects they will be chosen
+@@ -646,40 +696,46 @@
+ <varlistentry>
+ <term><guilabel>Browser</guilabel></term>
+ <listitem>
+-<para>Here you can enable/disable use of the browser &kview; plugin
+-<!-- FIXME: Find out what on earth this is about, no hints from WhatsThis to -->
+-<!-- go on -->
++<para>Here you can enable/disable use of the browser &kview; plugin, which
++enables you to browse through all the images in the current folder.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+-</sect2>
++</sect1>
+ 
+-<sect2 id="kview-options-application">
++<sect1 id="kview-options-application">
+ <title><guilabel>Application</guilabel></title>
+ 
+ <para>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.</para>
+ 
++<screenshot>
++<screeninfo>&kview; application configuration dialog</screeninfo>
++<mediaobject>
++<imageobject><imagedata fileref="kview-application-configuration.png" format="PNG"/></imageobject>
++<textobject><phrase>&kview; application configuration dialog</phrase></textobject>
++</mediaobject>
++</screenshot>
++
+ <variablelist>
+ <title><guilabel>Application</guilabel></title>
+ <varlistentry>
+ <term><guilabel>Resizing</guilabel></term>
+ <listitem><para>This option determines if the window and/or the image will be
+ resized after loading a new picture into &kview;. With <guilabel>Only resize
+-Window</guilabel> enabled, the &kview; window will be resized so that it snuggly
++window</guilabel> enabled, the &kview; window will be resized so that it snuggly
+ fits around the loaded image. Notice that this can reduce the main window almost
+ to a vertical arrangement of menu entries if you load a small button pixmap (you
+ can resize the window afterwards in the usual way, of course). If your image is
+ pretty large (in terms of pixels), sometimes the &kview; window is resized in
+ such a way that the caption bar completely moves off your screen. Similarly,
+-<guilabel>Resize Image to fit window</guilabel> resizes the image to fit into the &kview;
++<guilabel>Resize image to fit window</guilabel> resizes the image to fit into the &kview;
+ workspace (keeping its aspect ratio intact). And with <guilabel>Don't
+ resize anything</guilabel> as your choice, both &kview; and your image keep their
+-size.
+-Best fit
+-KView will resize the window to fit the image. The image will never be 
++size. With <guilabel>Best fit</guilabel>
++&kview; will resize the window to fit the image. The image will never be 
+ scaled up but if it is too large for the screen the image will be scaled down.
+ </para></listitem>
+ </varlistentry>
+@@ -691,7 +747,7 @@
+ <term><guilabel>Effects</guilabel></term>
+ <listitem>
+ <para>Provides some image effects (and adds an <guimenu>Effects</guimenu> to
+-the menubar to give you access to them.)</para>
++the menubar to give you access to them).</para>
+ </listitem>
+ </varlistentry>
+ 
+@@ -705,85 +761,33 @@
+ <varlistentry>
+ <term><guilabel>Scanner</guilabel></term>
+ <listitem>
+-<para>Open images from your scanner into &kview;</para>
++<para>Adds <guimenu>Scan Image...</guimenu> to the <guimenu>Tools</guimenu>
++menu to open images from your scanner into &kview;.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+-</sect2>
+-
+ </sect1>
+ 
+-<sect1 id="help-menu">
+-<title>The <guimenu>Help</guimenu> Menu</title>
+-
+-&help.menu.documentation;
+-
+-</sect1>
+-
+ </chapter>
+ 
+-<chapter id="command-line">
+-<title>Command Line Options</title>
+-
+-<para>&kview; can be started directly from a terminal like &konsole; or
+-<application>xterm</application>. Several command line options are
+-available.</para>
+-
+-<variablelist>
+-<varlistentry>
+-<term><command>kview</command> <option>--help</option></term>
+-<listitem><para>Lists the command line options (see below).</para></listitem>
+-</varlistentry>
+-<varlistentry>
+-<term><command>kview</command> <option>--help-qt</option></term>
+-<listitem><para>Shows the options specific to &Qt; (the <acronym>GUI</acronym>
+-library that &kde; is based on).</para></listitem>
+-</varlistentry>
+-<varlistentry>
+-<term><command>kview</command> <option>--help-kde</option></term>
+-<listitem><para>Shows the &kde;-specific options.</para></listitem>
+-</varlistentry>
+-<varlistentry>
+-<term><command>kview</command> <option>--help-all</option></term>
+-<listitem><para>Displays all command line options.</para></listitem>
+-</varlistentry>
+-<varlistentry>
+-<term><command>kview</command> <option>--author</option></term>
+-<listitem><para>You want to send your warm wishes and euphoric cheers to
+-someone? Here they are!</para></listitem>
+-</varlistentry>
+-<varlistentry>
+-<term><command>kview</command> <option>-v</option>,
+-<option>--version</option></term>
+-<listitem><para>Displays the version number of &kview; (and that of
+-&Qt;/&kde;).</para></listitem>
+-</varlistentry>
+-<varlistentry>
+-<term><command>kview</command> <option>--license</option></term>
+-<listitem><para>Shows under which licenses &kview; is being
+-published.</para></listitem>
+-</varlistentry>
+-</variablelist>
+-</chapter>
+-
+ <chapter id="credits">
+ <title>Credits and License</title>
+ 
+ <para>&kview;</para>
+ 
+ <para>Program copyright 1997-2001 Sirtaj S. Kang
+-<email>taj at kde.org</email></para>
+-
+-<para>KParts integration by Simon Hausmann
++&Sirtaj.Singh.Kang.mail;</para>
++<para>KParts integration by &Simon.Hausmann;
+ <email>shaus at neuro2.med.uni-magdeburg.de</email></para>
+ <para>Maintainer: Matthias Kretz <email>kretz at kde.org</email></para>
+-<para>Documentation copyright 2001 Hauke Hildebrandt
+-<email>hauke.hildebrandt at iup.uni-heidelberg.de</email>
++<para>Documentation copyright 2001 &Hauke.Hildebrandt;
++&Hauke.Hildebrandt.mail;
+ </para>
+ 
+ <para>Documentation substantially updated by Burkhard Lück
+ <email>lueck at hube-lueck.de</email> in 2005 for &kde; 3.5</para>
+ 
++<!-- TRANS:CREDIT_FOR_TRANSLATORS -->
+ &underFDL;               <!-- FDL: do not remove -->
+ &underGPL;        	 <!-- GPL License -->
+ 
+--- doc/kolourpaint/index.docbook	(revision 490050)
++++ doc/kolourpaint/index.docbook	(revision 494959)
+@@ -48,8 +48,8 @@
+ <legalnotice>
+ &FDLNotice;
+ </legalnotice>
+-<date>2005-02-03</date>
+-<releaseinfo>1.4_light</releaseinfo>
++<date>2005-12-29</date>
++<releaseinfo>1.4_relight</releaseinfo>
+ 
+ <abstract>
+ <para>
+@@ -475,6 +475,8 @@
+ </sect1>
+ 
+ <sect1 id="tool-erasers">
++<!-- This title does not contain the eraser icons because they are present in the
++sections; c.f. Connected Lines and Polygon, Rectangles and Selections. -->
+ <title>Erasers</title>
+ 
+ <sect2 id="tool-eraser-std">
+@@ -672,16 +674,22 @@
+ 
+ <para>To move the selection, click and drag on it. The main view will scroll as required to allow you to move the selection to part of the image that is not currently displayed.</para>
+ 
+-<para>You can free-form <link linkend="image-resize-scale">Smooth Scale</link> the selection or <link linkend="image-resize-scale">Resize</link> the image using the handles. The &RMB; invokes a context menu with common <guimenu>Edit</guimenu> commands and <link linkend="image-effects-section">Image Effects</link>.</para>
++<para>
++You can free-form <link linkend="image-resize-scale">Resize</link> the entire image or
++<link linkend="image-resize-scale">Smooth Scale</link> the selection using the corresponding handles.
++Hold &Shift; while free-form scaling the selection to maintain aspect ratio.
++The &RMB; invokes a context menu with common <guimenu>Edit</guimenu> commands and <link linkend="image-effects-section">Image Effects</link>.
++</para>
+ 
+ <tip>
+ <para>You can use the cursor keys while drawing out the boundary of the
+ selection or while moving it.</para>
+ </tip>
+ 
+-<para>If you hold &Ctrl; before moving the selection, then you will move a
+-copy of it. If you hold &Shift; before moving the selection, you will smear
+-it.</para>
++<para>
++If you hold &Ctrl; before moving the selection, then you will move a
++copy of it. The selection will be smeared when moving it while &Shift; is held.
++</para>
+ 
+ <informaltable>
+ <tgroup cols="2">
+@@ -792,8 +800,8 @@
+ </inlinemediaobject>
+ </para>
+ 
+-<para>The left picture shows the addition of text with an opaque foreground
+-color and transparent background color.  The right picture shows the
++<para>The left picture shows the addition of text with opaque foreground
++colors and a transparent background color.  The right picture shows the
+ addition of text with a transparent foreground color and opaque background
+ color.</para>
+ </sect2>
+@@ -967,17 +975,30 @@
+ </para>
+ 
+ <para>The first picture shows the <link linkend="tool-text">Text</link> tool icon, while the latter shows it at 600% zoom with the grid on.</para>
++
++<tip>
++<para>
++Another way of zooming when not drawing is to scroll the <mousebutton>wheel</mousebutton> while holding &Ctrl;.
++</para>
++</tip>
++
+ </sect1>
+ 
+ <sect1 id="view-thumbnail">
+ <title>Thumbnail</title>
+ <para>
+-Use the thumbnail to view the image as a whole.
++<inlinemediaobject>
++<imageobject>
++<imagedata fileref="view_thumbnails.png" format="PNG"/>
++</imageobject>
++</inlinemediaobject>
+ </para>
+-
+ <para>
+-If <guimenuitem>Zoomed Thumbnail Mode</guimenuitem> is selected, the thumbnail will display the entire image, scaling it as needed to fit, otherwise, it will show as much of the image as possible, unzoomed. To see what portion of the image the main view shows, enable the Thumbnail Rectangle.
++If <guimenuitem>Zoomed Thumbnail Mode</guimenuitem> is selected, the entire image is displayed, scaled as required to fit the thumbnail window (top-right picture).
+ </para>
++<para>
++Otherwise, the thumbnail displays as much of the image as possible, starting from the top-left of the main view (bottom-right picture).
++</para>
+ </sect1>
+ 
+ </chapter>
+@@ -1219,7 +1240,7 @@
+ 
+ <tip>
+ <para>
+-You can free-form <guibutton>Smooth Scale</guibutton> the selection or <guibutton>Resize</guibutton> the image using the handles.
++You can free-form <guibutton>Resize</guibutton> the entire image or <guibutton>Smooth Scale</guibutton> the selection using the corresponding handles.
+ </para>
+ </tip>
+ 
+@@ -1306,6 +1327,8 @@
+ </sect1>
+ 
+ <sect1 id="image-more-effects">
++<!-- More Effects is left at the end because it is not part of the Image Effects Reference - if a
++user selects the next page, the next page should be Autocrop / Remove Internal Border. -->
+ <title>More Effects</title>
+ 
+ <para>
+@@ -1373,10 +1396,15 @@
+ </para>
+ <para>Program Copyright &copy; 2003, 2004, 2005 &Clarence.Dang; &Clarence.Dang.mail;</para>
+ 
+-<para>&kolourpaint;-specific icons except The Ghost Copyright &copy; 2004 Kristof Borrey <email>borrey at kde.org</email></para>
++<para>
++&kolourpaint;-specific icons Copyright &copy; 2004, 2005
++Kristof Borrey <email>borrey at kde.org</email>,
++Nuno Pinheiro <email>nf.pinheiro at gmail.com</email>,
++Danny Allen <email>dannya40uk at yahoo.co.uk</email>
++</para>
+ 
+ <para>Documentation and additional documentation artwork Copyright &copy; 2004, 2005
+-&Thurston.Dang; &Thurston.Dang.mail;.</para>
++&Thurston.Dang; &Thurston.Dang.mail;</para>
+ 
+ <para>Portions reproduced with permission from <ulink
+ url="http://kolourpaint.sourceforge.net/"></ulink>.</para>
+@@ -1385,7 +1413,7 @@
+ 
+ <para>This program is licensed as follows:</para>
+ 
+-<para>Copyright &copy; 2003, 2004, 2005 Clarence Dang <email>dang at kde.org</email></para>
++<para>Copyright &copy; 2003, 2004, 2005 &Clarence.Dang; &Clarence.Dang.mail;</para>
+ 
+ <literallayout>
+ All rights reserved.
+@@ -1432,7 +1460,7 @@
+ <sect1 id="requirements">
+ <title>Requirements</title>
+ 
+-<para> &kolourpaint; 1.4_light requires &kde; 3.4.</para>
++<para> &kolourpaint; 1.4_relight requires &kde; 3.5.</para>
+ </sect1>
+ 
+ <sect1 id="compilation">
+--- doc/kuickshow/index.docbook	(revision 490050)
++++ doc/kuickshow/index.docbook	(revision 494959)
+@@ -17,22 +17,21 @@
+ <firstname>Carsten</firstname>
+ <surname>Pfeiffer</surname>
+ <affiliation>
+-<address><email>pfeiffer at kde.org</email></address>
++<address>&Carsten.Pfeiffer.mail;</address>
+ </affiliation>
+ </author>
++<!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+ 
+-<!-- TRANS:ROLES_OF_TRANSLATORS -->
+-
+ <copyright>
+ <year>2001</year>
+-<holder>Carsten Pfeiffer</holder>
++<holder>&Carsten.Pfeiffer;</holder>
+ </copyright>
+ 
+ <legalnotice>&FDLNotice;</legalnotice>
+ 
+-<date>2002-01-09</date>
+-<releaseinfo>1.01.00</releaseinfo>
++<date>2005-12-29</date>
++<releaseinfo>0.8.7</releaseinfo>
+ 
+ <!-- Abstract about this handbook -->
+ 
+@@ -76,12 +75,20 @@
+ </listitem>
+ <listitem><para>psd</para>
+ </listitem>
+-<listitem><para>xmp</para>
++<listitem><para>xpm</para>
+ </listitem>
+-<listitem><para>xbm</para>
++<listitem><para>ppm</para>
+ </listitem>
++<listitem><para>pgm</para>
++</listitem>
++<listitem><para>pbm</para>
++</listitem>
++<listitem><para>pnm</para>
++</listitem>
+ <listitem><para>eim</para>
+ </listitem>
++<listitem><para>xcf</para>
++</listitem>
+ </itemizedlist>
+ 
+ <para>Images can be displayed either in their own window, as large as
+@@ -93,9 +100,8 @@
+ <title>Using &kuickshow;</title>
+ 
+ <para>Using &kuickshow; is very simple.  The file browser lists files,
+-which you can select with a double click, the <keycap>Return</keycap>
+-key, or <guimenuitem>View</guimenuitem> in the
+-<mousebutton>Right</mousebutton> click popup menu.</para>
++which you can select with a &LMB; click or the <keycap>Return</keycap>
++key.</para>
+ 
+ <screenshot>
+ <screeninfo>Here's a screenshot of &kuickshow;</screeninfo>
+@@ -153,7 +159,7 @@
+ and <link linkend="slideshow-options"><guilabel>Slideshow</guilabel></link> 
+ configure the operation of &kuickshow;, and the other two,
+ <guilabel>Viewer Shortcuts</guilabel> and <guilabel>Browser
+-Shortcuts</guilabel> allow you to personalize the keybindings for the
++Shortcuts</guilabel> allow you to personalize the shortcuts for the
+ respective windows.</para>
+ 
+ <sect1 id="general-options">
+@@ -163,11 +169,10 @@
+ configure and tune &kuickshow;.</para>
+ 
+ <variablelist>
+-<title><guilabel>Settings</guilabel></title>
+ <varlistentry>
+ <term><guilabel>Fullscreen mode</guilabel></term>
+ <listitem>
+-<para>If this is selected,images open in full screen mode.  If the
++<para>If this is selected, images open in full screen mode.  If the
+ image is not large enough to fill the screen, the rest of the screen
+ is filled with the background color selected below.  The default is
+ off.</para>
+@@ -185,8 +190,16 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guilabel>Background color</guilabel></term>
++<term><guilabel>Remember last folder</guilabel></term>
+ <listitem>
++<para>If this is selected, &kuickshow; saves the name of the last folder on exit.
++On next start &kuickshow; will open this folder in the browser window.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guilabel>Background color:</guilabel></term>
++<listitem>
+ <para>Click on the colored bar to select a background color. This is
+ used to fill the screen in fullscreen mode, or the window, if you have
+ resized it larger than the image.</para>
+@@ -204,7 +217,7 @@
+ </variablelist>
+ 
+ <variablelist>
+-<title><guilabel>Quality / Speed</guilabel></title>
++<title><guilabel>Quality/Speed</guilabel></title>
+ <varlistentry>
+ <term><guilabel>Fast rendering</guilabel></term>
+ <listitem><para><!-- LW: Uhm.. help? -->Render things fast.</para>
+@@ -253,8 +266,77 @@
+ <sect1 id="modifications-options">
+ <title>The <guilabel>Modifications</guilabel> Tab</title>
+ 
+-<para>Not yet documented</para>
++<para>Check <guilabel>Apply default image modifications</guilabel> to open an image 
++with these modifications in &kuickshow;.</para>
+ 
++<variablelist>
++<title><guilabel>Scaling</guilabel></title>
++<varlistentry>
++<term><guilabel>Shrink image to screen size, if larger</guilabel></term>
++<listitem>
++<para>If this is selected, large images are displayed in maximized window. The default is
++on.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guilabel>Shrink image to screen size, if smaler, up to factor:</guilabel></term>
++<listitem>
++<para>If this is selected, &kuickshow; increases the magnification of small images up to 
++the selected factor.</para>
++</listitem>
++</varlistentry>
++
++</variablelist>
++
++<variablelist>
++<title><guilabel>Geometry</guilabel></title>
++<varlistentry>
++<term><guilabel>Flip vertically</guilabel></term>
++<listitem><para>Flips the image hvertically.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guilabel>Flip horizontally</guilabel></term>
++<listitem><para>Flips the image horizontally.
++</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guilabel>Rotate image</guilabel></term>
++<listitem><para>Rotates the image to 0, 90, 180 or 270 degrees.
++</para>
++</listitem>
++</varlistentry>
++
++</variablelist>
++
++<variablelist>
++<title><guilabel>Adjustments</guilabel></title>
++<varlistentry>
++<term><guilabel>Brightness:</guilabel></term>
++<listitem><para>Lightens/darkens the image.</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guilabel>Contrast:</guilabel></term>
++<listitem><para>Adds/Removes contrast.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><guilabel>Gamma:</guilabel></term>
++<listitem><para>More/less gamma.
++</para>
++</listitem>
++</varlistentry>
++
++</variablelist>
++
++<para>A <guilabel>Preview</guilabel> of the <guilabel>Original</guilabel> 
++and <guilabel>Modified</guilabel> image is displayed below this options.</para>
++
+ </sect1>
+ 
+ <sect1 id="slideshow-options">
+@@ -265,13 +347,13 @@
+ <varlistentry>
+ <term><guilabel>Switch to full-screen</guilabel></term>
+ <listitem>
+-<para>Indicates if KuickShow should switch to full-screen mode 
++<para>Indicates if &kuickshow; should switch to full-screen mode 
+ when starting the slideshow.
+ </para></listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guilabel>Start with current image:</guilabel></term>
++<term><guilabel>Start with current image</guilabel></term>
+ <listitem>
+ <para>Indicates if the slideshow should start with the first 
+ image in the folder or with the image which is selected.
+@@ -289,7 +371,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guilabel>Iterations:</guilabel></term>
++<term><guilabel>Iterations (0 = infinite):</guilabel></term>
+ <listitem>
+ <para>The amount of iterations. If set to 0 it will loop untill you 
+ abort the slideshow. You can use the slider, type a new value into the 
+@@ -301,15 +383,298 @@
+ </variablelist>
+ </sect1>
+ 
++<sect1 id="shortcuts-options">
++<title>The <guimenu>Shortcuts</guimenu> Tabs</title> 
++<para>Change the shortcuts for the different modes of &kuickshow;
++in the <guilabel>Viewer Shortcuts</guilabel> and the <guilabel>Browser Shortcuts</guilabel> tabs.</para>
++</sect1>
++
+ </chapter>
+ 
++<chapter id="menus">
++<title>Menu Reference</title>
++
++<sect1 id="file-menu">
++<title>The <guimenu>File</guimenu> Menu</title>
++
++<variablelist>
++<varlistentry>
++<term><menuchoice>
++<shortcut>
++<keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo>
++</shortcut>
++<guimenu>File</guimenu>
++<guimenuitem>Open</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Opens a new image</action> in &kuickshow;.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<guimenu>File</guimenu>
++<guimenuitem>Show Image</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Displays </action> the selected image in a new image 
++window.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<guimenu>File</guimenu>
++<guimenuitem>Show Image in Aktive Window</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Displays </action>the selected image in the active image 
++window.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<guimenu>File</guimenu>
++<guimenuitem>Show Image in Fullscreen Mode</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Displays</action> the selected image in fullscreen mode.
++</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<shortcut><keycap>F2</keycap></shortcut>
++<guimenu>File</guimenu>
++<guimenuitem>Start Slideshow</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Starts</action> a slideshow of the images in the folder.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<shortcut><keycombo action="simul">&Ctrl;
++<keycap>P</keycap></keycombo></shortcut>
++<guimenu>File</guimenu>
++<guimenuitem>Print Image...</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Prints the image</action>.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice><shortcut><keycombo action="simul">
++&Ctrl;<keycap>Q</keycap></keycombo></shortcut>
++<guimenu>File</guimenu>
++<guimenuitem>Quit</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Quits</action> &kuickshow;. If you have several
++images windows open, all of them are closed.</para></listitem>
++</varlistentry>
++
++</variablelist>
++
++</sect1>
++
++<sect1 id="edit-menu">
++<title>The <guimenu>Edit</guimenu> Menu</title>
++
++<variablelist>
++<varlistentry>
++<term><menuchoice>
++<shortcut><keycap>F10</keycap></shortcut>
++<guimenu>Edit</guimenu>
++<guimenuitem>New Folder...</guimenuitem></menuchoice>
++</term>
++<listitem>
++<para><action>Create</action> a new folder.</para> 
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice><shortcut><keycombo action="simul">
++<keycap>&Shift;</keycap><keycap>Delete</keycap></keycombo></shortcut>
++<guimenu>Edit</guimenu>
++<guimenuitem>Delete</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Deletes</action> the current file.  You will be asked to confirm the
++action.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<shortcut><keycombo action="simul">
++<keycap>&Alt;</keycap><keycap>Return</keycap></keycombo></shortcut>
++<guimenu>Edit</guimenu>
++<guimenuitem>Properties</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Displays</action> the properties of the current image file.</para></listitem>
++</varlistentry>
++</variablelist>
++
++</sect1>
++
++<sect1 id="view-menu">
++<title>The <guimenu>View</guimenu> Menu</title>
++
++<variablelist>
++<varlistentry>
++<term><menuchoice>
++<shortcut><keycap>F6</keycap></shortcut>
++<guimenu>View</guimenu>
++<guimenuitem>Short View</guimenuitem>
++</menuchoice></term>
++<listitem><para>If this option is selected, only the names of the files and folders will be shown.</para>
++<para>Compare this to detailed view.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<shortcut><keycap>F7</keycap></shortcut>
++<guimenu>View</guimenu>
++<guimenuitem>Detailed View</guimenuitem>
++</menuchoice></term>
++<listitem><para>If this option is selected, the names, sizes, dates, permissions, file owners and group ownerships are shown.</para>
++<para>Compare this to short view.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<shortcut><keycap>F8</keycap></shortcut>
++<guimenu>View</guimenu>
++<guimenuitem>Show Hidden Files</guimenuitem>
++</menuchoice></term>
++<listitem><para>This will toggle between revealing and hiding normally hidden files.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<shortcut><keycap>F12</keycap></shortcut>
++<guimenu>View</guimenu>
++<guimenuitem>Separate Folders</guimenuitem>
++</menuchoice></term>
++<listitem><para>Use this option to toggle between a 2 pane view of the file system (one pane for the folders
++and one pane for the files) and a one pane view of the file system with folders and files.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<guimenu>View</guimenu>
++<guimenuitem>Large Icons</guimenuitem>
++</menuchoice></term>
++<listitem><para>Display the image files in the folder with large icons. 
++This item is only available in <guimenuitem>Short View</guimenuitem> mode.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<guimenu>View</guimenu>
++<guimenuitem>Small Icons</guimenuitem>
++</menuchoice></term>
++<listitem><para>Display the image files in the folder with small icons. 
++This item is only available in <guimenuitem>Short View</guimenuitem> mode.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<guimenu>View</guimenu>
++<guimenuitem>Thumbnail Previews</guimenuitem>
++</menuchoice></term>
++<listitem><para>Display a preview of the images in the folder. This item is only available in <guimenuitem>Short View</guimenuitem> mode.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice><shortcut><keycombo action="simul">
++&Ctrl;<keycap>-</keycap></keycombo></shortcut>
++<guimenu>View</guimenu>
++<guimenuitem>Zoom Out</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Reduces the image size by ten percent</action>. Again
++this refers to the <emphasis>current</emphasis> size of the
++image.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice><shortcut><keycombo action="simul">
++&Ctrl;<keycap>+</keycap></keycombo></shortcut>
++<guimenu>View</guimenu>
++<guimenuitem>Zoom In</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Enlarges the image by ten percent</action>. Notice that
++this refers to the <emphasis>current</emphasis> size of the
++picture.</para></listitem>
++</varlistentry>
++</variablelist>
++
++</sect1>
++
++<sect1 id="settings-menu">
++<title>The <guimenu>Settings</guimenu> Menu</title>
++
++<variablelist>
++<varlistentry>
++<term><menuchoice>
++<guimenu>Settings</guimenu>
++<guimenuitem>Configure &kuickshow;...</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Opens a dialog for changing some options</action> as
++described in the section <xref linkend="configuration-dialog"/></para>
++</listitem>
++</varlistentry>
++</variablelist>
++</sect1>
++
++
++<sect1 id="help-menu">
++<title>The <guimenu>Help</guimenu> Menu</title>
++
++<variablelist>
++<varlistentry>
++<term>
++<menuchoice>
++<shortcut>
++<keycombo action="simul"><keycap>F1</keycap></keycombo>
++</shortcut>
++<guimenu>Help</guimenu>
++<guimenuitem>&kappname; Handbook</guimenuitem>
++</menuchoice>
++</term>
++<listitem><para><action>Invokes the &kde; Help system</action> starting at the
++&kappname; help pages. (this document).</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<guimenu>Help</guimenu>
++<guimenuitem>Report Bug...</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>Opens the Bug report dialog</action> where you can
++report a bug or request a <quote>wishlist</quote> feature.</para></listitem>
++</varlistentry>
++
++<varlistentry>
++<term><menuchoice>
++<guimenu>Help</guimenu>
++<guimenuitem>About &kappname;</guimenuitem>
++</menuchoice></term>
++<listitem><para><action>This will display version and author
++information.</action></para></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>
++
++</sect1>
++
++</chapter>
++
+ <chapter id="commands">
+ <title>Command Reference</title>
+ 
+ <sect1 id="keybindings">
+ <title>The Image Window</title>
+ 
+-<para>All the keybindings are configurable from the <link
++<para>All the shortcuts are configurable from the <link
+ linkend="configuration-dialog">Configuration Dialog</link>.</para>
+ 
+ <table>
+@@ -335,6 +700,10 @@
+ <entry>Loads the first image</entry>
+ </row>
+ <row>
++<entry><keycap>End</keycap></entry>
++<entry>Loads the last image</entry>
++</row>
++<row>
+ <entry><keycap>+</keycap></entry>
+ <entry>Zooms into the image</entry>
+ </row>
+@@ -356,10 +725,14 @@
+ counter-clockwise)</entry>
+ </row>
+ <row>
+-<entry><keycap>9</keycap></entry>
++<entry><keycap>8</keycap></entry>
+ <entry>Rotates 90&deg; clockwise</entry>
+ </row>
+ <row>
++<entry><keycap>9</keycap></entry>
++<entry>Rotates 180&deg; clockwise</entry>
++</row>
++<row>
+ <entry><keycap>Arrow</keycap> keys</entry>
+ <entry>Move the image (or rather, you, the viewer,) if it is larger
+ than the screen</entry>
+@@ -414,11 +787,15 @@
+ confirmation</entry>
+ </row>
+ <row>
++<entry><keycombo action="simul">&Alt;<keycap>Return</keycap></keycombo></entry>
++<entry>Displays the properties of the image</entry>
++</row>
++<row>
+ <entry><keycap>F1</keycap></entry>
+ <entry>Opens the online help (this file)</entry>
+ </row>
+ <row>
+-<entry><keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo></entry>
++<entry><keycombo action="simul">&Ctrl;<keycap>W</keycap></keycombo></entry>
+ <entry>Quits &kuickshow;</entry>
+ </row>
+ </tbody>
+@@ -576,14 +953,14 @@
+ &kuickshow;
+ </para>
+ <para>
+-Program copyright 1998-2002 Carsten Pfeiffer <email>pfeiffer at kde.org</email>
++Program copyright 1998-2002 &Carsten.Pfeiffer; &Carsten.Pfeiffer.mail;
+ </para>
+ 
+ <para>
+-Documentation copyright 2001 Carsten Pfeiffer <email>pfeiffer at kde.org</email>
++Documentation copyright 2001 &Carsten.Pfeiffer; &Carsten.Pfeiffer.mail;
+ </para>
+-<para>Converted to DocBook &XML; and extended by Lauri Watts
+-<email>lauri at kde.org</email></para>
++<para>Converted to DocBook &XML; and extended by &Lauri.Watts;
++&Lauri.Watts.mail;</para>
+ 
+ <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
+ 
+--- doc/kiconedit/index.docbook	(revision 490050)
++++ doc/kiconedit/index.docbook	(revision 494959)
+@@ -14,7 +14,7 @@
+ <firstname>Thomas</firstname>
+ <surname>Tanghus</surname>
+ <affiliation>
+-<address><email>tanghus at earthling.net</email></address>
++<address>&Thomas.Tanghus.mail;</address>
+ </affiliation>
+ </author>
+ 
+@@ -24,19 +24,19 @@
+ 
+ <copyright>
+ <year>1997</year>
+-<holder>Thomas Tanghus</holder>
++<holder>&Thomas.Tanghus;</holder>
+ </copyright>
+ <copyright>
+ <year>2001</year><year>2003</year>
+-<holder>Lauri Watts</holder>
++<holder>&Lauri.Watts;</holder>
+ </copyright>
+ 
+ <legalnotice>
+ &FDLNotice;
+ </legalnotice>
+ 
+-<date>2003-11-06</date>
+-<releaseinfo>3.1.93</releaseinfo>
++<date>2005-12-10</date>
++<releaseinfo>3.5.0</releaseinfo>
+ 
+ <abstract>
+ <para>
+@@ -57,8 +57,8 @@
+ <title>Introduction</title>
+ 
+ <blockquote>
+-<attribution>Thomas Tanghus
+-<email>tanghus at earthling.net</email></attribution>
++<attribution>&Thomas.Tanghus;
++&Thomas.Tanghus.mail;</attribution>
+ 
+ <para>
+ &kiconedit; is designed to help create icons for &kde; using the
+@@ -88,12 +88,12 @@
+ </para>
+ 
+ <sect1 id="main-toolbar">
+-<title>Main toolbar</title>
++<title>Main Toolbar</title>
+ 
+ <variablelist>
+ 
+ <varlistentry>
+-<term><guiicon>New File</guiicon></term>
++<term><guiicon>New</guiicon></term>
+ <listitem>
+ <para>
+ <action>Create a new icon.</action> If the current file has been
+@@ -105,7 +105,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guiicon>Open...</guiicon></term>
++<term><guiicon>Open</guiicon></term>
+ <listitem>
+ <para>
+ <action>Open an existing icon file.</action>
+@@ -171,15 +171,16 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guiicon>Zoom factor</guiicon></term>
+-<term><guiicon>Zoom in</guiicon></term>
+-<term><guiicon>Zoom out</guiicon></term>
++<term><guiicon>Zoom</guiicon></term>
++<term><guiicon>Zoom In</guiicon></term>
++<term><guiicon>Zoom Out</guiicon></term>
+ <listitem>
+ <para>
+ <action>Zoom to predefined zoom factor.</action>
+ </para>
+ </listitem>
+ </varlistentry>
++
+ <varlistentry>
+ <term><guiicon>Resize</guiicon></term>
+ <listitem>
+@@ -190,7 +191,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><action>Gray scale</action></term>
++<term><action>GrayScale</action></term>
+ <listitem>
+ <para>
+ <action>Gray scale the icon image.</action> This may create colors not
+@@ -200,29 +201,19 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guiicon>Show grid</guiicon></term>
++<term><guiicon>Show Grid</guiicon></term>
+ <listitem>
+ <para>
+ <action>Toggle grid on/off.</action>
+ </para>
+ </listitem>
+ </varlistentry>
+-
+-<varlistentry>
+-<term><guiicon>What's This</guiicon></term>
+-<listitem>
+-<para>
+-<action>Clicking this icon, then clicking anywhere else in the window,
+-will show a short tooltip describing the item you clicked on.</action>
+-</para>
+-</listitem>
+-</varlistentry>
+ </variablelist>
+ 
+ </sect1>
+ 
+ <sect1 id="tools-toolbar">
+-<title>Tools toolbar</title>
++<title>Tools Toolbar</title>
+ 
+ <para>
+ This toolbar contains the tools you can use to manipulate the
+@@ -240,7 +231,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guiicon>Color picker</guiicon></term>
++<term><guiicon>Color Picker</guiicon></term>
+ <listitem>
+ <para>
+ Doesn't change the icon but <action>changes the current drawcolor to the
+@@ -257,8 +248,9 @@
+ </para>
+ </listitem>
+ </varlistentry>
++
+ <varlistentry>
+-<term><guiicon>Filled rectangle</guiicon></term>
++<term><guiicon>Filled Rectangle</guiicon></term>
+ <listitem>
+ <para>
+ <action>Draw a filled rectangle.</action>
+@@ -276,7 +268,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guiicon>Filled circle</guiicon></term>
++<term><guiicon>Filled Circle</guiicon></term>
+ <listitem>
+ <para>
+ <action>Draw a filled circle.</action>
+@@ -284,9 +276,6 @@
+ </listitem>
+ </varlistentry>
+ 
+-
+-
+-
+ <varlistentry>
+ <term><guiicon>Ellipse</guiicon></term>
+ <listitem>
+@@ -297,7 +286,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guiicon>Filled ellipse</guiicon></term>
++<term><guiicon>Filled Ellipse</guiicon></term>
+ <listitem>
+ <para>
+ <action>Draw a filled ellipse</action> (almost the same thing as drawing
+@@ -316,7 +305,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guiicon>Flood fill</guiicon></term>
++<term><guiicon>Flood Fill</guiicon></term>
+ <listitem>
+ <para>
+ <action>Fill an area with the current color.</action>
+@@ -333,9 +322,8 @@
+ </listitem>
+ </varlistentry>
+ 
+-
+ <varlistentry>
+-<term><guiicon>Eraser</guiicon></term>
++<term><guiicon>Eraser (Transparent)</guiicon></term>
+ <listitem>
+ <para>
+ <action>Draw transparent (invisible).</action>
+@@ -381,7 +369,7 @@
+ <title>The Menu Entries</title>
+ 
+ <sect1 id="file">
+-<title><guimenu>File</guimenu></title>
++<title>The <guimenu>File</guimenu> Menu</title>
+ 
+ <para>
+ The following functions are available from the <guimenu>File</guimenu>
+@@ -522,7 +510,7 @@
+ </sect1>
+ 
+ <sect1 id="edit">
+-<title><guimenu>Edit</guimenu></title>
++<title>The <guimenu>Edit</guimenu> Menu</title>
+ 
+ <para>
+ The <guimenu>Edit</guimenu> menu contains the following entries:
+@@ -634,7 +622,7 @@
+ <keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo>
+ </shortcut>
+ <guimenu>Edit</guimenu>
+-<guimenuitem>Select all</guimenuitem>
++<guimenuitem>Select All</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+@@ -654,7 +642,7 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Grayscale</guimenuitem>
++<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>GrayScale</guimenuitem>
+ </menuchoice></term>
+ <listitem><para><action>Gray scale the icon image.</action> This may
+ create colors not conformant to the &kde; icon palette.</para>
+@@ -666,7 +654,7 @@
+ </sect1>
+ 
+ <sect1 id="view">
+-<title><guimenu>View</guimenu></title>
++<title>The <guimenu>View</guimenu> Menu</title>
+ 
+ <variablelist>
+ <varlistentry>
+@@ -675,7 +663,7 @@
+ <shortcut>
+ <keycombo action="simul">&Ctrl;<keycap>+</keycap></keycombo></shortcut>
+ <guimenu>View</guimenu>
+-<guimenuitem>Zoom in</guimenuitem>
++<guimenuitem>Zoom In</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+@@ -691,7 +679,7 @@
+ <shortcut><keycombo action="simul">
+ &Ctrl;<keycap>-</keycap></keycombo></shortcut>
+ <guimenu>View</guimenu>
+-<guimenuitem>Zoom out</guimenuitem>
++<guimenuitem>Zoom Out</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+@@ -717,7 +705,7 @@
+ </sect1>
+ 
+ <sect1 id="tools">
+-<title><guimenu>Tools</guimenu></title>
++<title>The <guimenu>Tools</guimenu> Menu</title>
+ 
+ <variablelist>
+ <varlistentry>
+@@ -844,7 +832,7 @@
+ <term>
+ <menuchoice>
+ <guimenu>Tools</guimenu>
+-<guimenuitem>Flood fill</guimenuitem>
++<guimenuitem>Flood Fill</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+@@ -895,7 +883,7 @@
+ </sect1>
+ 
+ <sect1 id="settings">
+-<title><guimenu>Settings</guimenu> </title>
++<title>The <guimenu>Settings</guimenu> Menu</title>
+ 
+ <variablelist>
+ 
+@@ -916,7 +904,7 @@
+ <term>
+ <menuchoice>
+ <guimenu>Settings</guimenu>
+-<guimenuitem>Show Statusbar</guimenuitem>
++<guimenuitem>Show/Hide Statusbar</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+@@ -929,7 +917,7 @@
+ <term>
+ <menuchoice>
+ <guimenu>Settings</guimenu>
+-<guimenuitem>Show Grid</guimenuitem>
++<guimenuitem>Show/Hide Grid</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+@@ -950,12 +938,13 @@
+ <term>
+ <menuchoice>
+ <guimenu>Settings</guimenu>
+-<guimenuitem>Configure KIconEdit...</guimenuitem>
++<guimenuitem>Configure &kiconedit;...</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+ <para>
+-Opens the &kiconedit; configuration dialog, described separately.
++Opens the &kiconedit; <link linkend="configuration">configuration
++dialog</link> configuration dialog, described separately.
+ </para>
+ </listitem>
+ </varlistentry>
+@@ -966,13 +955,55 @@
+ </sect1>
+ 
+ <sect1 id="help">
+-<title><guimenu>Help</guimenu></title>
++<title>The <guimenu>Help</guimenu> Menu</title>
+ 
+ &help.menu.documentation;
+ 
+ </sect1>
+ </chapter>
+ 
++<chapter id="configuration">
++<title>Configuration</title>
++
++<sect1>
++<title>Configuring &kiconedit;</title>
++<para>Selecting the <menuchoice><guimenu>Settings</guimenu>
++<guimenuitem>Configure &kiconedit;...</guimenuitem></menuchoice> menu item will
++open a configuration dialog which the tree tabs <guilabel>Icon Templates</guilabel>,
++<guilabel>Background</guilabel> and <guilabel>Icon Grid</guilabel>.</para>
++
++<screenshot>
++<screeninfo>&kiconedit; configuration dialog</screeninfo>
++<mediaobject>
++<imageobject><imagedata fileref="kiconedit-configuration.png" format="PNG"/></imageobject>
++<textobject><phrase>&kiconedit; configuration dialog</phrase></textobject>
++</mediaobject>
++</screenshot>
++
++<sect2 id="icon-templates-tab">
++<title>The <guilabel>Icon Templates</guilabel> Tab</title>
++<para><guilabel>Add...</guilabel>, <guilabel>Edit...</guilabel> and <guilabel>Remove</guilabel>
++the templates for <guilabel>Standard File</guilabel>, <guilabel>Source File</guilabel>, 
++<guilabel>Compressed File</guilabel> &etc;.</para>
++</sect2>
++<sect2 id="background-tab">
++<title>The <guilabel>Background</guilabel> Tab</title>
++<para>Select to <guibutton>Use color</guibutton> or to <guibutton>Use pixmap</guibutton>
++as background.  A <guilabel>Preview</guilabel> of your choice is displayed.</para>
++</sect2>
++<sect2 id="icon-grid-tab">
++<title>The <guilabel>Icon Grid</guilabel> Tab</title>
++<para>Select to <guilabel>Paste transparent pixels</guilabel> or <guilabel>Show rulers</guilabel>
++and set a <guilabel>Solid Color</guilabel> or a <guilabel>Checkerboard</guilabel> as 
++<guilabel>Transparency Display</guilabel>.
++You can set the Checkerboard <guilabel>Size:</guilabel> to <guilabel>Small</guilabel>, 
++<guilabel>Medium</guilabel> or <guilabel>Large</guilabel> and choose <guilabel>Color 1:</guilabel> 
++and <guilabel>Color 2:</guilabel> of the checkerboard.</para>
++</sect2>
++</sect1>
++
++</chapter>
++
+ <chapter id="credits-and-license">
+ <title>Credits and Licenses</title>
+ 
+@@ -981,7 +1012,7 @@
+ </para>
+ 
+ <para>
+-Program copyright Thomas Tanghus <email>tanghus at kde.org</email>
++Program copyright &Thomas.Tanghus; <email>tanghus at kde.org</email>
+ </para>
+ 
+ <itemizedlist>
+@@ -996,10 +1027,10 @@
+ Laurent Montel <email>lmontel at mandrakesoft.com</email>
+ </para>
+ </listitem>
+-<listitem><para>Aaron Seigo  <email>aseigo at olympusproject.org</email></para></listitem>
++<listitem><para>Aaron Seigo  &Aaron.J.Seigo.mail;</para></listitem>
+ <listitem><para>Nadeem Hassan <email>nhasan at nadmm.com</email> - Rewrote UI to use
+ XMLGUI, Lots of fixes and cleanup</para></listitem>
+-<listitem><para>Adrian Page <email>Adrian.Page at tesco.net</email> - Bug Fixes and GUI tidy up.</para></listitem>
++<listitem><para>Adrian Page <email>Adrian.Page at tesco.net</email> - Bug Fixes and &GUI; tidy up.</para></listitem>
+ 
+ 
+ </itemizedlist>
+@@ -1031,8 +1062,7 @@
+ <!-- 
+ <sect1 id="configuration">
+ <title>Configuration</title>
+-<para>
+-</para>
++
+ </sect1>
+ 
+ -->
+--- ksvg/dom/SVGPolylineElement.h	(revision 490050)
++++ ksvg/dom/SVGPolylineElement.h	(revision 494959)
+@@ -14,8 +14,8 @@
+ 
+     You should have received a copy of the GNU Library General Public
+     License along with this library; see the file COPYING.LIB.  If
+-    not, write to the Free Software Foundation, Inc., 59 Temple Place
+-    - Suite 330, Boston, MA 02110-1301, USA.
++    not, write to the Free Software Foundation, Inc., 51 Franklin Street,
++    Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ 
+     This file includes excerpts from the Scalable Vector Graphics
+--- ksvg/dom/SVGTextElement.h	(revision 490050)
++++ ksvg/dom/SVGTextElement.h	(revision 494959)
+@@ -14,8 +14,8 @@
+ 
+     You should have received a copy of the GNU Library General Public
+     License along with this library; see the file COPYING.LIB.  If
+-    not, write to the Free Software Foundation, Inc., 59 Temple Place
+-    - Suite 330, Boston, MA 02110-1301, USA.
++    not, write to the Free Software Foundation, Inc., 51 Franklin Street,
++    Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ 
+     This file includes excerpts from the Scalable Vector Graphics
+--- ksvg/dom/SVGLineElement.h	(revision 490050)
++++ ksvg/dom/SVGLineElement.h	(revision 494959)
+@@ -14,8 +14,8 @@
+ 
+     You should have received a copy of the GNU Library General Public
+     License along with this library; see the file COPYING.LIB.  If
+-    not, write to the Free Software Foundation, Inc., 59 Temple Place
+-    - Suite 330, Boston, MA 02110-1301, USA.
++    not, write to the Free Software Foundation, Inc., 51 Franklin Street,
++    Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ 
+     This file includes excerpts from the Scalable Vector Graphics
+--- ksvg/dom/SVGEllipseElement.h	(revision 490050)
++++ ksvg/dom/SVGEllipseElement.h	(revision 494959)
+@@ -14,8 +14,8 @@
+ 
+     You should have received a copy of the GNU Library General Public
+     License along with this library; see the file COPYING.LIB.  If
+-    not, write to the Free Software Foundation, Inc., 59 Temple Place
+-    - Suite 330, Boston, MA 02110-1301, USA.
++    not, write to the Free Software Foundation, Inc., 51 Franklin Street,
++    Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ 
+     This file includes excerpts from the Scalable Vector Graphics
+--- ksvg/dom/SVGRectElement.h	(revision 490050)
++++ ksvg/dom/SVGRectElement.h	(revision 494959)
+@@ -14,8 +14,8 @@
+ 
+     You should have received a copy of the GNU Library General Public
+     License along with this library; see the file COPYING.LIB.  If
+-    not, write to the Free Software Foundation, Inc., 59 Temple Place
+-    - Suite 330, Boston, MA 02110-1301, USA.
++    not, write to the Free Software Foundation, Inc., 51 Franklin Street,
++    Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ 
+     This file includes excerpts from the Scalable Vector Graphics
+--- ksvg/dom/SVGCircleElement.h	(revision 490050)
++++ ksvg/dom/SVGCircleElement.h	(revision 494959)
+@@ -14,8 +14,8 @@
+ 
+     You should have received a copy of the GNU Library General Public
+     License along with this library; see the file COPYING.LIB.  If
+-    not, write to the Free Software Foundation, Inc., 59 Temple Place
+-    - Suite 330, Boston, MA 02110-1301, USA.
++    not, write to the Free Software Foundation, Inc., 51 Franklin Street,
++    Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ 
+     This file includes excerpts from the Scalable Vector Graphics
+--- ksvg/dom/SVGPolygonElement.h	(revision 490050)
++++ ksvg/dom/SVGPolygonElement.h	(revision 494959)
+@@ -14,8 +14,8 @@
+ 
+     You should have received a copy of the GNU Library General Public
+     License along with this library; see the file COPYING.LIB.  If
+-    not, write to the Free Software Foundation, Inc., 59 Temple Place
+-    - Suite 330, Boston, MA 02110-1301, USA.
++    not, write to the Free Software Foundation, Inc., 51 Franklin Street,
++    Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ 
+     This file includes excerpts from the Scalable Vector Graphics
+--- ksvg/core/ksvgrenderer.desktop	(revision 490050)
++++ ksvg/core/ksvgrenderer.desktop	(revision 494959)
+@@ -11,7 +11,7 @@
+ Comment[cy]=Ôl-wyneb Llunio KSVG
+ Comment[da]=Underliggende program for KSVG-visning
+ Comment[de]=KSVG-Darstellungsmodul
+-Comment[el]=Σύστημα υποστήριξης απόδοσης γραφικών του KSVG
++Comment[el]=Σύστημα υποστήριξης αποτύπωσης του KSVG
+ Comment[es]=Motor de procesado de KSVG
+ Comment[et]=KSVG renderdamise taustarakendus
+ Comment[eu]=KSVG errendatze programa
+--- ksvg/plugin/backends/libart/ksvglibartcanvas.desktop	(revision 490050)
++++ ksvg/plugin/backends/libart/ksvglibartcanvas.desktop	(revision 494959)
+@@ -12,7 +12,7 @@
+ Name[cy]=Ôl-wyneb Llunio KSVG - Libart
+ Name[da]=Underliggende program til KSVG-visning - Libart
+ Name[de]=KSVG-Darstellungsmodul - Libart
+-Name[el]=Σύστημα υποστήριξης απόδοσης γραφικών του KSVG - Libart
++Name[el]=Σύστημα υποστήριξης αποτύπωσης του KSVG - Libart
+ Name[es]=Motor de procesado de KSVG - Libart
+ Name[et]=KSVG renderdamise taustarakendus - Libart
+ Name[eu]=KSVG errendatze programa - Libart
+@@ -49,7 +49,7 @@
+ Comment[cy]=Ôl-wyneb llunio ksvg aeddfed
+ Comment[da]=Modent underliggende program til ksvg-visning
+ Comment[de]=Ausgereiftes KSVG-Darstellungsmodul
+-Comment[el]=Ώριμο σύστημα υποστήριξης απόδοσης γραφικών του KSVG
++Comment[el]=Ώριμο σύστημα υποστήριξης αποτύπωσης του KSVG
+ Comment[es]=Motor de procesado de ksvg tradicional
+ Comment[et]=Kasutamisküps ksvg renderdamise taustarakendus
+ Comment[eu]=ksvg errendatze programa egonkorra
+--- ksvg/plugin/backends/agg/ksvgaggcanvas.desktop	(revision 490050)
++++ ksvg/plugin/backends/agg/ksvgaggcanvas.desktop	(revision 494959)
+@@ -12,7 +12,7 @@
+ Name[cy]=Ôl-wyneb Llunio KSVG - Geometreg Wrth-Raen
+ Name[da]=Underliggende program for KSVG-visning - antikorn geometri
+ Name[de]=KSVG-Darstellungsmodul - Antikörnungs-Geometrie
+-Name[el]= Σύστημα υποστήριξης απόδοσης γραφικών του KSVG - Anti Grain Geometry
++Name[el]= Σύστημα υποστήριξης αποτύπωσης του KSVG - Anti Grain Geometry
+ Name[es]=Motor de procesado de KSVG - Geometría suavizada
+ Name[et]=KSVG renderdamise taustarakendus - teralisusevastane geomeetria (AGG)
+ Name[eu]=KSVG errendatze programa - Anti Grain geometriarekin
+@@ -50,7 +50,7 @@
+ Comment[cy]=Ôl-wyneb llunio ksvg newydd, ansad
+ Comment[da]=Ny, ustabil underliggende program til ksvg-visning
+ Comment[de]=Neues, unausgereiftes KSVG-Darstellungsmodul
+-Comment[el]=Νέο υπό ανάπτυξη σύστημα υποστήριξης απόδοσης γραφικών
++Comment[el]=Νέο υπό ανάπτυξη σύστημα υποστήριξης αποτύπωσης
+ Comment[es]=Nuevo motor de procesado de ksvg, inestable
+ Comment[et]=Uus ebastabiilne ksvg renderdamise taustarakendus
+ Comment[eu]=Berria, ksvg errendatze programa ezegonkorra
+--- ksnapshot/ksnapshotwidget.ui.h	(revision 490050)
++++ ksnapshot/ksnapshotwidget.ui.h	(revision 494959)
+@@ -27,6 +27,8 @@
+     default:
+ 	break;
+     }
++
++    spinDelay->setEnabled(mode != 2);
+ }
+ 
+ 
+--- ksnapshot/regiongrabber.cpp	(revision 490050)
++++ ksnapshot/regiongrabber.cpp	(revision 494959)
+@@ -89,6 +89,14 @@
+   pixmap = QPixmap::grabWindow( qt_xrootwin() );
+   setPaletteBackgroundPixmap( pixmap );
+ 
++  QDesktopWidget desktopWidget;
++  QRect desktopSize;
++  if ( desktopWidget.isVirtualDesktop() )
++    desktopSize = desktopWidget.geometry();
++  else
++    desktopSize = desktopWidget.screenGeometry( qt_xrootwin() );
++
++  setGeometry( desktopSize );
+   showFullScreen();
+ 
+   QApplication::setOverrideCursor( crossCursor );
+--- ksnapshot/ksnapshot.cpp	(revision 490050)
++++ ksnapshot/ksnapshot.cpp	(revision 494959)
+@@ -256,7 +256,7 @@
+ {
+     hide();
+ 
+-    if ( mainWidget->delay() )
++    if ( mainWidget->delay() && mainWidget->mode() != Region )
+ 	grabTimer.start( mainWidget->delay() * 1000, true );
+     else {
+ 	if ( mainWidget->mode() == Region ) {
+--- kviewshell/kmultipage.cpp	(revision 490050)
++++ kviewshell/kmultipage.cpp	(revision 494959)
+@@ -167,7 +167,7 @@
+ 
+   if (QFile(fileName).exists()) {
+     int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Shall I overwrite that file?").arg(fileName),
+-				       i18n("Overwrite File"), i18n("OverWrite"));
++				       i18n("Overwrite File"), i18n("Overwrite"));
+     if (r == KMessageBox::Cancel)
+       return;
+   }
+--- kviewshell/kmultipage.desktop	(revision 490050)
++++ kviewshell/kmultipage.desktop	(revision 494959)
+@@ -4,6 +4,7 @@
+ Name=KViewShell MultiPage
+ Name[da]=KViewShell Multiside
+ Name[de]=KViewShell Mehrfachseiten
++Name[el]=Πολλαπλή σελίδα KViewShell
+ Name[es]=Multipágina KViewShell
+ Name[fi]=KViewShell MoniSivu
+ Name[fr]=Multi-page KViewShell
+--- kviewshell/plugins/djvu/pageRangeWidget.h	(revision 490050)
++++ kviewshell/plugins/djvu/pageRangeWidget.h	(revision 494959)
+@@ -15,7 +15,7 @@
+  *   You should have received a copy of the GNU General Public License     *
+  *   along with this program; if not, write to the                         *
+  *   Free Software Foundation, Inc.,                                       *
+- *   51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.             *
++ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
+  ***************************************************************************/
+ 
+ #ifndef PAGERANGEWIDGET_H
+--- kviewshell/plugins/djvu/djvumultipage.cpp	(revision 490050)
++++ kviewshell/plugins/djvu/djvumultipage.cpp	(revision 494959)
+@@ -334,8 +334,8 @@
+     fileName = fileName+ending;
+ 
+   if (QFile(fileName).exists()) {
+-    int r = KMessageBox::warningContinueCancel(parentWdg, i18n("The file %1\nexists. Shall I overwrite that file?").arg(fileName),
+-					       i18n("Overwrite File"), i18n("OverWrite"));
++    int r = KMessageBox::warningContinueCancel(parentWdg, i18n("The file %1\nalready exists. Do you want to overwrite it?").arg(fileName),
++					       i18n("Overwrite File"), i18n("Overwrite"));
+     if (r == KMessageBox::Cancel)
+       return;
+   }
+--- kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui	(revision 490050)
++++ kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui	(revision 494959)
+@@ -115,11 +115,11 @@
+                 </sizepolicy>
+             </property>
+             <property name="whatsThis" stdset="0">
+-                <string>&lt;p&gt;Good DJVU files are separated into forground and background images. The foreground mostly contains the text. With the render mode you can decide what part of your page will be printed.&lt;/p&gt;
+-&lt;p&gt;&lt;b&gt;Print full page:&lt;/b&gt; The full page, including foreground and background will be printed, either in color or in grayscale.&lt;/p&gt;
+-&lt;p&gt;&lt;b&gt;Black and White:&lt;/b&gt; Foreground and background are printed, but only in black-and-white. If this option is chosen, the files generated will print much faster, but quality will not be as good.&lt;/p&gt;
+-&lt;p&gt;&lt;b&gt;Foreground only:&lt;/b&gt; This option is useful if the background of the page is disturbing and affects the readability of the text.&lt;/p&gt;
+-&lt;p&gt;&lt;b&gt;Background only:&lt;/b&gt; Print only the background of the page.&lt;/p&gt;</string>
++                <string>&lt;p&gt;Good DJVU files are separated into foreground and background images. The foreground mostly contains the text. With the render mode you can decide what part of your page will be printed.&lt;/p&gt;
++&lt;p&gt;&lt;b&gt;Print Full Page:&lt;/b&gt; The full page, including foreground and background will be printed, either in color or in grayscale.&lt;/p&gt;
++&lt;p&gt;&lt;b&gt;Black &amp; White:&lt;/b&gt; Foreground and background are printed, but only in black-and-white. If this option is chosen, the files generated will print much faster, but quality will not be as good.&lt;/p&gt;
++&lt;p&gt;&lt;b&gt;Foreground Only:&lt;/b&gt; This option is useful if the background of the page is disturbing and affects the readability of the text.&lt;/p&gt;
++&lt;p&gt;&lt;b&gt;Background Only:&lt;/b&gt; Print only the background of the page.&lt;/p&gt;</string>
+             </property>
+         </widget>
+         <spacer row="2" column="1">
+--- kviewshell/plugins/djvu/pageRangeWidget.cpp	(revision 490050)
++++ kviewshell/plugins/djvu/pageRangeWidget.cpp	(revision 494959)
+@@ -15,7 +15,7 @@
+  *   You should have received a copy of the GNU General Public License     *
+  *   along with this program; if not, write to the                         *
+  *   Free Software Foundation, Inc.,                                       *
+- *   51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.             *
++ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
+  ***************************************************************************/
+ 
+ #include <kdebug.h>
+--- kviewshell/emptymultipage.desktop	(revision 490050)
++++ kviewshell/emptymultipage.desktop	(revision 494959)
+@@ -3,6 +3,7 @@
+ Comment=
+ Name=EmptyMultiPage
+ Name[de]=Leere Mehrfachseite
++Name[el]=ΚενήΠολλαπλήΣελίδα
+ Name[es]=Vaciado multipágina
+ Name[fi]=TyhjäMoniSivu
+ Name[fr]=Multi-page vide
+--- kviewshell/kviewpart.cpp	(revision 490050)
++++ kviewshell/kviewpart.cpp	(revision 494959)
+@@ -338,6 +338,12 @@
+ 
+ KViewPart::~KViewPart()
+ {
++  // Without the next two lines, konqueror crashes when it is quit
++  // while displaying a DVI file. I don't really understand
++  // why... --Stefan.
++  if (manager() != 0)
++    manager()->removePart(this);
++
+   // Delete the partManager;
+   setManager(0);
+   delete partManager;
+--- kamera/kcontrol/kamera.cpp	(revision 490050)
++++ kamera/kcontrol/kamera.cpp	(revision 494959)
+@@ -17,7 +17,7 @@
+ 
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ */
+ #include <qlabel.h>
+--- kamera/kcontrol/kameradevice.cpp	(revision 490050)
++++ kamera/kcontrol/kameradevice.cpp	(revision 494959)
+@@ -17,7 +17,7 @@
+ 
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ */
+ #include <qlayout.h>
+--- kamera/kcontrol/kamera.h	(revision 490050)
++++ kamera/kcontrol/kamera.h	(revision 494959)
+@@ -17,7 +17,7 @@
+ 
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ */
+ #ifndef __kamera_h__
+--- kamera/kcontrol/kameradevice.h	(revision 490050)
++++ kamera/kcontrol/kameradevice.h	(revision 494959)
+@@ -17,7 +17,7 @@
+ 
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ */
+ #ifndef __kameradevice_h__
+--- kamera/kcontrol/kameraconfigdialog.cpp	(revision 490050)
++++ kamera/kcontrol/kameraconfigdialog.cpp	(revision 494959)
+@@ -17,7 +17,7 @@
+ 
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ */
+ #include <qlayout.h>
+--- kamera/kcontrol/kameraconfigdialog.h	(revision 490050)
++++ kamera/kcontrol/kameraconfigdialog.h	(revision 494959)
+@@ -17,7 +17,7 @@
+ 
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ */
+ #ifndef __kameraconfigdialog_h__
+--- kamera/kioslave/kamera.cpp	(revision 490050)
++++ kamera/kioslave/kamera.cpp	(revision 494959)
+@@ -16,7 +16,7 @@
+ 
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ */
+ 
+--- kamera/kioslave/kamera.h	(revision 490050)
++++ kamera/kioslave/kamera.h	(revision 494959)
+@@ -16,7 +16,7 @@
+ 
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ */
+ 
+--- kfile-plugins/raw/parse.c	(revision 490050)
++++ kfile-plugins/raw/parse.c	(revision 494959)
+@@ -713,10 +713,12 @@
+ 			printf (" %d", sget4(dp));
+ 			dp += 4;
+ 			break;
+-		      case 3:
+-			val = sget4(dp);
+-			printf (" %9f", *(float *)(&val));
++		      case 3: {
++                        union { int ival; float fval; } __t;
++			__t.ival = sget4(dp);
++			printf (" %9f", __t.fval);
+ 			dp += 4;
++                      }
+ 		    }
+ 		  printf ("\n");
+ 		}
+--- kfile-plugins/dds/kfile_dds.desktop	(revision 490050)
++++ kfile-plugins/dds/kfile_dds.desktop	(revision 494959)
+@@ -6,6 +6,7 @@
+ Name[cs]=DirectDraw Surface info
+ Name[da]=DirectDraw overflade-info
+ Name[de]=DirectDraw Oberflächeninfo
++Name[el]=Πληροφορίες επιφάνειας DirectDraw
+ Name[es]=Información de la primera vista de DirectDraw
+ Name[et]=DirectDraw Surface'i info
+ Name[eu]=DirectDraw Surface informazioa




More information about the pkg-kde-commits mailing list