packages: kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff, kde4-k...
arekm
arekm at pld-linux.org
Tue Mar 16 21:03:08 CET 2010
Author: arekm Date: Tue Mar 16 20:03:08 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2; branch diff updated
---- Files affected:
packages/kde4-kdebase-workspace:
kde4-kdebase-workspace-branch.diff (1.17 -> 1.18) , kde4-kdebase-workspace.spec (1.196 -> 1.197)
---- Diffs:
================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff
diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff:1.17 packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff:1.18
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff:1.17 Thu Feb 18 00:34:35 2010
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff Tue Mar 16 21:03:03 2010
@@ -1,4190 +1,3391 @@
---- workspace/kcontrol/autostart/autostart.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091888)
-+++ workspace/kcontrol/autostart/autostart.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091888)
-@@ -125,7 +125,7 @@
- Comment[id]=Alat konfigurasi untuk mengatur program mana yang dijalankan bersama KDE.
- Comment[is]=Stjórntæki til að stilla hvaða forrit eigi að ræsast upp með KDE.
- Comment[it]=Uno strumento di configurazione per impostare quali programmi avviare insieme a KDE.
--Comment[ja]=KDE の起動時に開始するプログラムを設定するためのツール
-+Comment[ja]=KDE の起動時に開始するプログラムを設定
- Comment[kk]=KDE бастауымен жегілетін бағдарламаларды тағайындайтын құрал.
- Comment[km]=ឧបករណ៍កំណត់រចនាសម្ព័ន្ធ សម្រាប់គ្រប់គ្រងកម្មវិធីដែលចាប់ផ្ដើមជាមួយនឹង KDE ។
- Comment[kn]=ಕೆಡಿಇ ಯೊಡನೆ ಯಾವ ಕ್ರಮವಿಧಿಗಳು ಪ್ರಾರಂಭವಾಗಬೇಕೆಂಬುದನ್ನು ಸಂರಚಿಸಲು ಒಂದು ಸಲಕರಣೆ
---- workspace/kcontrol/randr/outputconfig.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091888)
-+++ workspace/kcontrol/randr/outputconfig.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091888)
-@@ -45,6 +45,8 @@
- connect(m_output, SIGNAL(outputChanged(RROutput, int)),
- this, SLOT(outputChanged(RROutput, int)));
-
-+ load();
-+
- connect(sizeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setConfigDirty()));
- connect(refreshCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setConfigDirty()));
- connect(orientationCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setConfigDirty()));
-@@ -63,7 +65,6 @@
- updatePositionListTimer.setSingleShot( true );
- connect( &updatePositionListTimer, SIGNAL( timeout()), SLOT( updatePositionListDelayed()));
-
-- load();
- }
-
- OutputConfig::~OutputConfig()
-@@ -294,6 +295,9 @@
-
- void OutputConfig::updatePositionListDelayed()
- {
-+ disconnect(positionCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setConfigDirty()));
-+ disconnect(positionOutputCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setConfigDirty()));
+--- workspace/ksmserver/server.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104125)
++++ workspace/ksmserver/server.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104125)
+@@ -658,6 +658,8 @@
+ int i;
+ while( (i = display.indexOf(':')) >= 0)
+ display[i] = '_';
++ while( (i = display.indexOf('/')) >= 0)
++ display[i] = '_';
+
+ fName += '_'+display.toLocal8Bit();
+ FILE *f;
+@@ -728,6 +730,8 @@
+ int i;
+ while( (i = display.indexOf(':')) >= 0)
+ display[i] = '_';
++ while( (i = display.indexOf('/')) >= 0)
++ display[i] = '_';
+
+ fName += '_'+display.toLocal8Bit();
+ ::unlink(fName.data());
+--- workspace/kcontrol/dateandtime/clock.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104125)
++++ workspace/kcontrol/dateandtime/clock.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104125)
+@@ -21,7 +21,7 @@
+ Name[bn_IN]=তারিখ ও সময়
+ Name[br]=Deiziad hag eur
+ Name[ca]=Data i hora
+-Name[ca at valencia]=Dia i hora
++Name[ca at valencia]=Data i hora
+ Name[cs]=Datum a čas
+ Name[csb]=Datum ë czas
+ Name[cy]=Dyddiad ac Amser
+@@ -47,7 +47,7 @@
+ Name[hsb]=Datum & čas
+ Name[hu]=Dátum és idő
+ Name[id]=Tanggal & Waktu
+-Name[is]=Dagssetning og tími
++Name[is]=Dagsetning og tími
+ Name[it]=Data e ora
+ Name[ja]=日付と時刻
+ Name[ka]=თარიღი და დრო
+--- workspace/kcontrol/randr/module/randrmonitor.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104125)
++++ workspace/kcontrol/randr/module/randrmonitor.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104125)
+@@ -22,6 +22,7 @@
+ Name[km]=រកឃើញការផ្លាស់ប្ដូរ RANDR (កម្មវិធីត្រួតពិនិត្យ)
+ Name[kn]=RANDR(ಮಾನಿಟರ್) ಬದಲಾವಣೆಗಳನ್ನು ಪತ್ತೆಹಚ್ಚುತ್ತಿದೆ
+ Name[ko]=RANDR(모니터) 변경 확인 중
++Name[lt]=Aptinkami RANDR (monitoriaus) pasikeitimai
+ Name[lv]=Nosaka RANDR (ekrāna) izmaiņas
+ Name[mk]=Детекција на RANDR промени (на мониторот)
+ Name[ml]=റാന്ഡര് (മൊണിറ്റെര്) മാറ്റങ്ങള് കണ്ടുപിടിയ്ക്കുന്നു
+--- workspace/doc/plasma-desktop/tools/man-plasmaengineexplorer.1.docbook (.../tags/KDE/4.4.1/kdebase) (wersja 0)
++++ workspace/doc/plasma-desktop/tools/man-plasmaengineexplorer.1.docbook (.../branches/KDE/4.4/kdebase) (wersja 1104125)
+@@ -0,0 +1,127 @@
++<?xml version="1.0" ?>
++<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!ENTITY % English "INCLUDE">
++]>
++
++<refentry lang="&language;">
++<refentryinfo>
++<title>KDE User's Manual</title>
++<date>Jan 2, 2008</date>
++<productname>K Desktop Environment</productname>
++</refentryinfo>
++
++<refmeta>
++<refentrytitle><command>plasmaengineexplorer</command></refentrytitle>
++<manvolnum>1</manvolnum>
++</refmeta>
++
++<refnamediv>
++<refname><command>plasmaengineexplorer</command></refname>
++<refpurpose>Provides direct access to plasma data engines</refpurpose>
++</refnamediv>
++
++<refsynopsisdiv>
++<cmdsynopsis>
++<command>plasmaengineexplorer</command>
++
++<group choice="opt"><option>--height</option> <replaceable> pixels</replaceable></group>
++<group choice="opt"><option>--width</option> <replaceable> pixels</replaceable></group>
++<group choice="opt"><option>-x</option> <replaceable> pixels</replaceable></group>
++<group choice="opt"><option>-y</option> <replaceable> pixels</replaceable></group>
++<group choice="opt"><option>--engine</option> <replaceable> name</replaceable></group>
++<group choice="opt"><option>--source</option> <replaceable> name</replaceable></group>
++<group choice="opt"><option>--interval</option> <replaceable> ms</replaceable></group>
++
++</cmdsynopsis>
++<cmdsynopsis>
++<command>plasmaengineexplorer</command>
++<arg choice="opt">KDE Generic Options</arg>
++<arg choice="opt">Qt Generic Options</arg>
++</cmdsynopsis>
++</refsynopsisdiv>
++
++<refsect1>
++<title>Description</title>
++<para><command>plasmaengineexplorer</command> is a graphical tool allowing developers to
++test Plasma data engines without writing a Plasma applet.</para>
++
++<para>If no options are given, it will start without any data engine
++selected. The required data engine can be selected from a drop-down list.</para>
++
++<para>Only installed data engines will be found.
++<command>kbuildsycoca4</command> may need to be run for newly-installed
++data engines to be found.</para>
++</refsect1>
+
- bool enable = !resolution().isEmpty();
- positionCombo->setEnabled( enable );
- positionLabel->setEnabled( enable );
-@@ -338,6 +342,9 @@
- if(index != -1)
- positionOutputCombo->setCurrentIndex(index);
- }*/
++<refsect1>
++<title>Options</title>
+
-+ connect(positionCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setConfigDirty()));
-+ connect(positionOutputCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setConfigDirty()));
- }
-
- void OutputConfig::updateRotationList(void)
---- workspace/doc/klipper/index.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1091888)
-+++ workspace/doc/klipper/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1091888)
-@@ -30,8 +30,8 @@
-
- <legalnotice>&FDLNotice;</legalnotice>
-
--<date>2005-01-31</date>
--<releaseinfo>2.92.00</releaseinfo>
-+<date>2010-01-14</date>
-+<releaseinfo>0.9.7 (&kde; 4.4)</releaseinfo>
-
- <abstract>
- <para>&klipper; is the &kde; clipboard cut & paste utility.</para>
-@@ -49,10 +49,8 @@
- <title>Introduction</title>
- <para>&klipper; is the &kde; clipboard utility. It stores clipboard
- history, and allows you to link clipboard contents to application
--actions. Please report any problems or feature requests to Esben Mose
--Hansen (see <ulink
--url="http://mosehansen.dk/about">http://mosehansen.dk/about</ulink>
--for contact details).</para>
-+actions. Please report any problems or feature requests to<ulink
-+url="http://bugs.kde.org">KDEs bugzilla</ulink> or use the "report bug" feature.</para>
-
- </chapter>
-
-@@ -89,9 +87,9 @@
- open, press <keycombo action="simul">&Alt;<keycap>L</keycap>
- </keycombo>.</para>
-
--<para>To remove &klipper;, click on the handle next to it (a small
--black triangle), and from the menu that appears, select
--<guimenuitem>Remove Klipper</guimenuitem>.</para>
-+<para>To disable &klipper;, click on its icon and
-+from the menu that appears, select
-+<guimenuitem>Quit</guimenuitem>.</para>
-
- </sect1>
-
-@@ -101,30 +99,35 @@
- <para>&klipper; can perform actions on the contents of the clipboard,
- based on whether they match a particular regular expression. For
- example, any clipboard contents starting with <quote>http://</quote> can
--be passed to &Netscape; or &konqueror; as &URL;s to open.</para>
-+be passed to Firefox or &konqueror; as &URL;s to open. In addition, if the
-+contents matches a path, similar actions can be performed according to the file's
-+type. E.g, if the path to a pdf file is copied to the clipboard, the file can be
-+view in Okular</para>
-
--<para>To use this feature, just copy a &URL; or filename to the
--clipboard. If there is a matching regular expression in &klipper;'s
--list, a menu will appear showing you the options you have (⪚ Open
--&URL; in &konqueror;, open &URL; in &Netscape;). Use the mouse or
--keyboard to select the option you want, and &klipper; will run the
--program you have selected, opening the address pointed to by the
--clipboard contents.</para>
-+<para>To use this feature, just select a &URL; or path. <!-- starting with slash ?-->
-+If there is a matching regular expression in &klipper;'s
-+list, a menu will appear showing you the programs for your selection.
-+Use the mouse or cursor keys to select a program, and &klipper; will run
-+this program, opening the address pointed to by the
-+selection.</para>
-
- <para>If you do not want to perform any actions on the clipboard
--contents, select <guimenuitem>Do Nothing</guimenuitem> on the pop-up menu
-+contents, select <guimenuitem>Disable This Popup</guimenuitem> on the pop-up menu
- to return to what you were doing before. If you leave the menu, it will
- disappear, leaving you to continue your work. You can change the time
- that the menu remains for in the <guilabel>Configure Klipper...</guilabel>
--dialog, with the option <guilabel>Timeout for action pop-ups</guilabel>
--under the <guilabel>General</guilabel> tab.</para>
--
-+dialog, with the option <guilabel>Timeout for action popups</guilabel>
-+under the <guilabel>General</guilabel> tab. You can separately disable the
-+file path part using the option <guilabel>Enable MIME-based actions</guilabel> under
-+the <guilabel>Actions</guilabel> tab.</para>
-+
- <para>Actions can be disabled completely by clicking on &klipper; and
--selecting <guimenuitem>Actions Enabled</guimenuitem>, or by pressing
-+deselecting <guimenuitem>Actions Enabled</guimenuitem>, or by pressing
- <keycombo action="simul">&Ctrl;&Alt;<keycap>X</keycap></keycombo>.</para>
-
- <para>Clipboard contents which match a regular expression can also be
--edited before performing an action on them. Select <guimenuitem>Edit contents...</guimenuitem> on the &klipper; pop-up menu, and you can
-+edited before performing an action on them. Select <guimenuitem>Edit
-+contents...</guimenuitem> on the &klipper; pop-up menu, and you can
- change the clipboard contents in the dialog which appears, before
- clicking the <guibutton>OK</guibutton> button to run the appropriate
- action.</para>
-@@ -178,10 +181,11 @@
- <sect2 id="changing-clipboard-modes">
- <title>Changing Clipboard/Selection Behavior</title>
- <para>
-+<!-- this has changed in kde 4.4-->
- In order to change clipboard/selection behavior, select
--<guimenuitem>Configure Klipper...</guimenuitem> from the &klipper; pop-up menu,
-+<guimenuitem>Configure &klipper;...</guimenuitem> from the &klipper; pop-up menu,
- and in the dialog box that appears, select the
--<guilabel>General</guilabel> tab. Selecting <guilabel>Separate clipboard and
-+<guilabel>General</guilabel> tab. Unchecking <guilabel>Synchronize contents of the clipboard and the
- selection</guilabel> makes the clipboard and selection function as completely
- separate buffers as described above. With this option set, the option
- <guilabel>Ignore selection</guilabel> will prevent &klipper; from
-@@ -243,13 +247,10 @@
- </varlistentry>
-
- <varlistentry>
--<term><guilabel>Remove white space when executing actions</guilabel></term>
--<listitem><para>If selected, any white space (spaces, tabs, &etc;) at the
--beginning and end of the clipboard contents will be removed before passing the
--clipboard contents to an application. This is useful, for example, if the
--clipboard contains a &URL; with spaces which, if opened by a web browser, would
--cause an error.</para>
--</listitem>
-+<term><guilabel>Prevent empty clipboard</guilabel></term>
-+<listitem><para>If selected, the clipboard will never be empty: &klipper; will
-+insert the most recent item from the clipboard history into the clipboard
-+instead of allowing it to be empty.</para></listitem>
- </varlistentry>
-
- <varlistentry>
-@@ -262,36 +263,59 @@
- </varlistentry>
-
- <varlistentry>
--<term><guilabel>Prevent empty clipboard</guilabel></term>
--<listitem><para>If selected, the clipboard will never be empty: &klipper; will
--insert the most recent item from the clipboard history into the clipboard
--instead of allowing it to be empty.</para></listitem>
-+<term><guilabel>Remove white space when executing actions</guilabel></term>
-+<listitem><para>If selected, any white space (spaces, tabs, &etc;) at the
-+beginning and end of the clipboard contents will be removed before passing the
-+clipboard contents to an application. This is useful, for example, if the
-+clipboard contains a &URL; with spaces which, if opened by a web browser, would
-+cause an error.</para>
++<variablelist>
++<varlistentry>
++<term><option>--height <replaceable>pixels</replaceable></option></term>
++<listitem><para>Sets the height of the window, in pixels.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><option>--width <replaceable>pixels</replaceable></option></term>
++<listitem><para>Sets the width of the window, in pixels.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><option>-x <replaceable>pixels</replaceable></option></term>
++<listitem><para>Sets the x (horizontal) co-ordinate of the top left corner of the window, in pixels.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><option>-y <replaceable>pixels</replaceable></option></term>
++<listitem><para>Sets the y (vertical) co-ordinate of the top left corner of the window, in pixels.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><option>--engine <replaceable>name</replaceable></option></term>
++<listitem><para>Start <command>plasmaengineexplorer</command> with the given data engine
++selected. <parameter>name</parameter> is the internal name of the data engine given by
++the X-KDE-PluginInfo-Name key of the desktop file.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><option>--source <replaceable>name</replaceable></option></term>
++<listitem><para>Only valid in conjunction with <option>--engine</option>.
++Requests a specific source from the data engine when
++<command>plasmaengineexplorer</command> is started.</para></listitem>
++</varlistentry>
++<varlistentry>
++<term><option>--interval <replaceable>time</replaceable></option></term>
++<listitem><para>Sets the default update interval for requested sources
++to <parameter>time</parameter> milliseconds. If not set, the source will update
++on demand (for some sources, this will be when new data is available).</para>
++
++<para>If <option>--source</option> is specified, this is the update interval
++that will be used when requesting that source.</para></listitem>
++</varlistentry>
++
++</variablelist>
++
++</refsect1>
++
++<refsect1>
++<title>See Also</title>
++
++<para>More detailed user documentation is available from <ulink
++url="help:/plasma">help:/plasma</ulink>
++(either enter this <acronym>URL</acronym> into &konqueror;, or run
++<userinput><command>khelpcenter</command>
++<parameter>help:/plasma</parameter></userinput>).</para>
++
++</refsect1>
++
++<refsect1>
++<title>Examples</title>
++<para>Load the time data engine, showing the local time and updating every
++second:</para>
++<screen><userinput><command>plasmaengineexplorer</command> <option>--engine time</option> <option>--source Local</option> <option>--interval 1000</option></userinput></screen>
++
++</refsect1>
++
++<refsect1>
++<title>Authors</title>
++<para><command>plasmaengineexplorer</command> was written by
++<personname><firstname>Aaron</firstname><surname>Seigo</surname></personname> <email>aseigo at kde.org</email>.</para>
++</refsect1>
++
++</refentry>
+--- workspace/doc/plasma-desktop/tools/CMakeLists.txt (.../tags/KDE/4.4.1/kdebase) (wersja 0)
++++ workspace/doc/plasma-desktop/tools/CMakeLists.txt (.../branches/KDE/4.4/kdebase) (wersja 1104125)
+@@ -0,0 +1,5 @@
++########### install files ###############
++#
++
++#
++kde4_create_manpage(man-plasmaengineexplorer.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
+--- workspace/doc/plasma-desktop/index.docbook (.../tags/KDE/4.4.1/kdebase) (wersja 0)
++++ workspace/doc/plasma-desktop/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1104125)
+@@ -0,0 +1,423 @@
++<?xml version="1.0" ?>
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++ <!ENTITY kappname "&plasma;">
++ <!ENTITY package "kde-module">
++ <!ENTITY % addindex "IGNORE">
++ <!ENTITY % English "INCLUDE">
++]>
++<book lang="&language;">
++
++<bookinfo>
++<title>The &plasma; Handbook</title>
++
++<authorgroup>
++<author>
++<personname>
++<firstname>Sebastian</firstname>
++<surname>Kügler</surname>
++</personname>
++<email>sebas at kde.org</email>
++</author>
++<!-- TRANS:ROLES_OF_TRANSLATORS -->
++</authorgroup>
++
++<copyright>
++<year>2008</year>
++<holder>Sebastian Kügler</holder>
++</copyright>
++
++<legalnotice>&FDLNotice;</legalnotice>
++
++<date>2008-06-03</date>
++<releaseinfo>1.01.00</releaseinfo>
++
++<abstract>
++<para>
++&plasma;, the most visible pillar of &kde;, is the core interface to the desktop.
++</para>
++</abstract>
++
++<keywordset>
++<keyword>KDE</keyword>
++<keyword>Plasma</keyword>
++<keyword>Plasmoid</keyword>
++<keyword>Containments</keyword>
++<keyword>Desktop</keyword>
++<keyword>Runner</keyword>
++<keyword>Kicker</keyword>
++</keywordset>
++
++</bookinfo>
++
++<chapter id="introduction">
++<title>Introduction</title>
++
++<para>
++&plasma; is one of the key technologies of &kde; 4 (also known as the
++"Pillars of &kde;"), and one of the most visible to users. As &plasma;
++treats the user interface differently than a traditional desktop, there may be
++confusion on what &plasma; is, what it does, and how to perform common tasks.
++</para>
++
++<para>
++This document attempts to address these problems by providing answers to the
++most common questions.
++</para>
++</chapter>
++
++<chapter id="using-kapp">
++<title>Using &plasma;</title>
++
++<sect1 id="plasmoids-and-containments">
++<title>&plasmoids; and Containments</title>
++
++<para>
++The essence of Plasma revolves around two basic concepts:
++</para>
++
++<variablelist>
++<varlistentry>
++<term>&plasmoids;</term>
++<listitem>
++<para>
++Applets, or small applications that live on the desktop.
++</para>
+</listitem>
- </varlistentry>
-
- <varlistentry>
-+<term><guilabel>Ignore images</guilabel></term>
-+<listitem><para>When an area of the screen is selected with mouse or keyboard,
-+this is called the <quote>selection</quote>. If this option is selected, only text
-+selections are stored in the history, while images and other selections are not.
++</varlistentry>
++<varlistentry>
++<term>Containments</term>
++<listitem>
++<para>
++Applets that act as the container for the &plasmoids;
+</para>
+</listitem>
-+</varlistentry>
++</varlistentry>
++</variablelist>
+
-+<varlistentry>
- <term><guilabel>Ignore selection</guilabel></term>
--<listitem><para>Sets the clipboard mode. See <xref linkend="clipboard-modes"/>.
-+<listitem><para>Sets the clipboard mode. This option will prevent &klipper; from
-+including the contents of the selection in its clipboard history and from
-+performing actions on the contents of the selection. See <xref linkend="clipboard-modes"/>.
- </para>
- </listitem>
- </varlistentry>
-
--
- <varlistentry>
--<term><guilabel>Synchronize contents of the clipboard and the
--selection</guilabel></term>
--<listitem><para>Sets the clipboard mode. See <xref linkend="clipboard-modes"/>.
-+<term><guilabel>Text selection only</guilabel></term>
-+<listitem><para>When an area of the screen is selected with mouse or keyboard, this is
-+called the <quote>selection</quote>. If this option is selected, only text selections
-+are stored in the history, while images and other selections are not.
-+See <xref linkend="clipboard-modes"/>.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
--<term><guilabel>Separate clipboard and selection</guilabel></term>
--<listitem><para>Sets the clipboard mode. See <xref linkend="clipboard-modes"/>.
-+<term><guilabel>Synchronize contents of the clipboard and the
-+selection</guilabel></term>
-+<listitem><para>Sets the clipboard mode.
-+When an area of the screen is selected with mouse or keyboard, this is
-+called the <quote>selection</quote>. If this option is selected, the selection and the
-+clipboard is kept the same, so that anything in the selection is immediately
-+"available for pasting elsewhere using any method, including the traditional
-+middle mouse button. Otherwise, the selection is recorded in the clipboard
-+history, but the selection can only be pasted using the middle mouse button.
-+Also see the <guilabel>Ignore selection</guilabel> option.
-+See <xref linkend="clipboard-modes"/>.
- </para>
- </listitem>
- </varlistentry>
-
--
- <varlistentry>
- <term><guilabel>Timeout for Action pop-ups</guilabel></term>
- <listitem><para>Set the time that a popup menu will remain for if you do
-@@ -317,7 +341,7 @@
- <listitem><para>On the <guilabel>Actions</guilabel> tab, double-click
- the regular expression or action that you want to edit. An in-place text editing
- box will appear in which the text can be edited as you wish. Make sure you
--press <keysym>Enter</keysym> when you are done.</para></listitem>
-+press &Enter; when you are done.</para></listitem>
- </varlistentry>
-
- <varlistentry>
-@@ -344,15 +368,15 @@
-
- <para>Note that <token>%s</token> in the command line is replaced with
- the clipboard contents, ⪚ if your command definition is
--<userinput><command>kedit</command> <token>%s</token></userinput> and
-+<userinput><command>kwrite</command> <token>%s</token></userinput> and
- your clipboard contents are <filename>/home/phil/textfile</filename>,
--the command <userinput><command>kedit</command>
-+the command <userinput><command>kwrite</command>
- <filename>/home/phil/textfile</filename></userinput> will be run. To
- include <token>%s</token> in the command line, escape it with a
- backslash, as so: <userinput>\%s</userinput>.</para></listitem>
- </varlistentry>
-
--<varlistentry><term><guibutton>Advanced...</guibutton></term>
-+<varlistentry><term><guibutton>Advanced</guibutton></term>
- <listitem><para>Brings up the <guilabel>Disable Actions for windows of type
- WM_CLASS</guilabel> dialog.</para>
- <para>Some programs, such as &konqueror;,
-@@ -398,9 +422,9 @@
- <varlistentry>
- <term><guilabel>Custom</guilabel></term>
- <listitem><para>The selected action is assigned to the keys you choose.</para>
--<para>To choose a custom key for the action you have selected, click on the
--representation of a key in the lower right of the screen to activate it, and
--type the desired key combination on your keyboard, as in any &kde; application.
-+<para>To choose a custom key for the action you have selected, click on
-+<guilabel>Custom</guilabel> and then <guilabel>None</guilabel>.
-+Now type the desired key combination on your keyboard, as in any &kde; application.
- </para> </listitem>
- </varlistentry>
- </variablelist>
-@@ -447,12 +471,7 @@
-
- <sect1 id="compilation">
- <title>Compilation and Installation</title>
--<para>&klipper; should compile and install along with the kdebase
--package, and appear on your &kde; panel (&kicker;) when you run &kde;
--3. If it does not appear, you can start it by selecting
--<guimenuitem>Add Applet to Panel...</guimenuitem>
--in any context menu in &kicker;, the &kde; Panel
--and choosing <guilabel>Klipper</guilabel> in the dialog.</para>
-+&install.compile.documentation;
-
- <screenshot>
- <screeninfo>&klipper; icon</screeninfo>
---- workspace/doc/kcontrol/kwinscreenedges/index.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1091888)
-+++ workspace/doc/kcontrol/kwinscreenedges/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1091888)
-@@ -14,12 +14,12 @@
- <!-- TRANS:ROLES_OF_TRANSLATORS -->
- </authorgroup>
-
--<date>2009-11-17</date>
-+<date>2010-02-04</date>
- <releaseinfo>&kde; 4.4</releaseinfo>
-
- <keywordset>
- <keyword>KDE</keyword>
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec?r1=1.196&r2=1.197&f=u
More information about the pld-cvs-commit
mailing list