summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules4
-rw-r--r--AUTHORS2
m---------cmake0
-rw-r--r--doc/tdefilereplace/index.docbook103
-rw-r--r--doc/tdefilereplace/kfr_standalone_main_window_1.pngbin67688 -> 0 bytes
-rw-r--r--doc/tdefilereplace/optionsdialog_main_window_1.pngbin44797 -> 42990 bytes
-rw-r--r--doc/tdefilereplace/optionsdialog_main_window_2.pngbin36955 -> 40309 bytes
-rw-r--r--doc/tdefilereplace/report_example.pngbin48533 -> 99195 bytes
-rw-r--r--doc/tdefilereplace/results_view.pngbin54949 -> 84787 bytes
-rw-r--r--doc/tdefilereplace/strings_view.pngbin9506 -> 7424 bytes
-rw-r--r--doc/tdefilereplace/tfr_standalone_main_window_1.pngbin0 -> 112486 bytes
-rw-r--r--doc/tdefilereplace/toolbar.pngbin8217 -> 10487 bytes
-rw-r--r--kcalc/kcalc.desktop23
-rw-r--r--kcharselect/KCharSelect.desktop24
-rw-r--r--kdf/disklist.h2
-rw-r--r--kdf/kdf.desktop28
-rw-r--r--kedit/KEdit.desktop24
-rw-r--r--kfloppy/KFloppy.desktop24
-rw-r--r--kgpg/kgpg.desktop25
-rw-r--r--kgpg/kgpg.kcfg2
-rw-r--r--khexedit/khexedit.desktop18
-rw-r--r--kjots/Kjots.desktop17
-rw-r--r--klaptopdaemon/applnk/klaptopdaemon.desktop124
-rw-r--r--klaptopdaemon/applnk/laptop.desktop144
-rw-r--r--klaptopdaemon/applnk/pcmcia.desktop32
-rw-r--r--kmilo/asus/kmilo_asus.desktop13
-rw-r--r--kmilo/delli8k/kmilo_delli8k.desktop13
-rw-r--r--kmilo/demo/kmilo_demo.desktop15
-rw-r--r--kmilo/generic/kmilo_generic.desktop15
-rw-r--r--kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop20
-rw-r--r--kmilo/kmilo_kvaio/kmilo_kvaio.desktop16
-rw-r--r--kmilo/kmilod/kmilod.desktop21
-rw-r--r--kmilo/powerbook/kmilo_powerbook.desktop202
-rw-r--r--kmilo/powerbook2/kmilo_powerbook.desktop14
-rw-r--r--kmilo/thinkpad/kmilo_thinkpad.desktop13
-rw-r--r--kregexpeditor/gen_qregexplexer.cpp42
-rw-r--r--kregexpeditor/gen_qregexpparser.cc16
-rw-r--r--kregexpeditor/kregexpeditor.desktop19
-rw-r--r--ksim/ksim.desktop19
-rw-r--r--ksim/ksimpref.cpp2
-rw-r--r--ksim/monitors/filesystem/DFree.desktop2
-rw-r--r--ksim/monitors/filesystem/filesystemwidget.cpp2
-rw-r--r--ktimer/ktimer.desktop21
-rw-r--r--superkaramba/src/main.cpp2
-rw-r--r--superkaramba/src/superkaramba.desktop99
-rw-r--r--superkaramba/src/superkaramba.lsm14
-rw-r--r--tdefilereplace/configurationclasses.cpp2
-rw-r--r--tdefilereplace/configurationclasses.h3
-rw-r--r--tdefilereplace/kaddstringdlg.cpp60
-rw-r--r--tdefilereplace/kaddstringdlg.h13
-rw-r--r--tdefilereplace/knewprojectdlg.cpp2
-rw-r--r--tdefilereplace/knewprojectdlg.h2
-rw-r--r--tdefilereplace/koptionsdlg.cpp2
-rw-r--r--tdefilereplace/koptionsdlg.h4
-rw-r--r--tdefilereplace/main.cpp2
-rw-r--r--tdefilereplace/tdefilereplace.desktop65
-rw-r--r--tdefilereplace/tdefilereplaceiface.h2
-rw-r--r--tdefilereplace/tdefilereplacelib.cpp103
-rw-r--r--tdefilereplace/tdefilereplacelib.h14
-rw-r--r--tdefilereplace/tdefilereplacepart.cpp312
-rw-r--r--tdefilereplace/tdefilereplacepart.desktop103
-rw-r--r--tdefilereplace/tdefilereplacepart.h12
-rw-r--r--tdefilereplace/tdefilereplacepartui.rc19
-rw-r--r--tdefilereplace/tdefilereplaceview.cpp615
-rw-r--r--tdefilereplace/tdefilereplaceview.h27
-rw-r--r--tdefilereplace/tdefilereplaceviewwdg.ui4
-rw-r--r--tdefilereplace/whatthis.h2
-rw-r--r--tdelirc/kcmlirc/CMakeLists.txt1
-rw-r--r--tdelirc/kcmlirc/kcmlirc.desktop115
-rw-r--r--tdeutils.lsm14
-rw-r--r--tdewallet/konfigurator/konfigurator.cpp2
-rw-r--r--tdewallet/tdewalletmanager-tdewalletd.desktop1
-rw-r--r--tdewallet/tdewalletmanager.desktop1
73 files changed, 1238 insertions, 1440 deletions
diff --git a/.gitmodules b/.gitmodules
index 4fce771..bdec8fc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
[submodule "admin"]
path = admin
- url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
+ url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
[submodule "cmake"]
path = cmake
- url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
+ url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
diff --git a/AUTHORS b/AUTHORS
index 3f6e510..d7cf3f7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,7 +24,7 @@ ktimemon Dirk A. Mueller <dmuell@gmx.net>
ktop Chris Schlaeger <cs@kde.org>
kwrite Jochen Wilhelmy <digisnap@cs.tu-berlin.de>
TDEFileReplace: Maintainer: Emiliano Gulmini <emi_barbarossa@yahoo.it>, Andras Mantia <amantia@kde.org>
- Original author: Francois Dupoux <fdupoux@dupoux.com>
+ Original author: François Dupoux <fdupoux@dupoux.com>
Look in the subdirs to get more info about the authors.
diff --git a/cmake b/cmake
-Subproject 5121b9a41d671dbaf7350c349d246793d8d8a4e
+Subproject 8668335711fa13cec276552d75bfbb4285c7edb
diff --git a/doc/tdefilereplace/index.docbook b/doc/tdefilereplace/index.docbook
index 571b6ff..4db26f9 100644
--- a/doc/tdefilereplace/index.docbook
+++ b/doc/tdefilereplace/index.docbook
@@ -57,7 +57,7 @@
<chapter id="introduction">
<title>Introduction</title>
- <para>&tdefilereplace; is an application used to search and replace a list of strings in a file tree. The strings may be literal or Qt-like regular expressions. There are also other options to tune your search.
+ <para>&tdefilereplace; is an application used to search and replace a list of strings in a file tree. The strings may be literal or TQt-like regular expressions. There are also other options to tune your search.
</para>
</chapter>
@@ -69,7 +69,7 @@
<screeninfo>&tdefilereplace; in its standalone incarnation</screeninfo>
<mediaobject>
<imageobject>
- <imagedata fileref="kfr_standalone_main_window_1.png" format="PNG"/>
+ <imagedata fileref="tfr_standalone_main_window_1.png" format="PNG"/>
</imageobject>
<textobject>
<phrase>&tdefilereplace; in its standalone incarnation</phrase>
@@ -89,9 +89,6 @@
<imageobject>
<imagedata fileref="toolbar.png" format="PNG"/>
</imageobject>
- <imageobject>
- <imagedata fileref="toolbar.eps" format="EPS"/>
- </imageobject>
<textobject>
<phrase>&tdefilereplace;'s toolbar</phrase>
</textobject>
@@ -128,18 +125,6 @@
</varlistentry>
<varlistentry>
- <term>
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="filereplace.png" format="PNG"/>
- </imageobject>
- </inlinemediaobject><guiicon>Replace</guiicon></term>
- <listitem>
- <para>This button starts a search&amp;replace loop. When a string has been found, &tdefilereplace; replaces it with another string.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>
<inlinemediaobject>
<imageobject>
@@ -152,6 +137,18 @@
</varlistentry>
<varlistentry>
+ <term>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="filereplace.png" format="PNG"/>
+ </imageobject>
+ </inlinemediaobject><guiicon>Replace</guiicon></term>
+ <listitem>
+ <para>This button starts a search&amp;replace loop. When a string has been found, &tdefilereplace; replaces it with another string.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>
<inlinemediaobject>
<imageobject>
@@ -189,18 +186,6 @@
<varlistentry>
<term>
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="edit.png" format="PNG"/>
- </imageobject>
- </inlinemediaobject><guiicon>Edit Strings</guiicon></term>
- <listitem>
- <para>This button edits a selected string.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>
<inlinemediaobject>
<imageobject>
<imagedata fileref="eraser.png" format="PNG"/>
@@ -251,18 +236,6 @@
<term>
<inlinemediaobject>
<imageobject>
- <imagedata fileref="recursive_option.png" format="PNG"/>
- </imageobject>
- </inlinemediaobject><guiicon>Search in Subfolders</guiicon></term>
- <listitem>
- <para>This button allows you to search/replace recursively in the subfolders of your base directory.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>
- <inlinemediaobject>
- <imageobject>
<imagedata fileref="backup_option.png" format="PNG"/>
</imageobject>
</inlinemediaobject><guiicon>Make Backup Files</guiicon></term>
@@ -320,17 +293,14 @@
<imageobject>
<imagedata fileref="results_view.png" format="PNG"/>
</imageobject>
- <imageobject>
- <imagedata fileref="results_view.eps" format="EPS"/>
- </imageobject>
<textobject>
<phrase>&tdefilereplace;'s Results view</phrase>
</textobject>
</mediaobject>
</screenshot>
- <para>The <guilabel>Results</guilabel> view shows the name of the files that contain the strings you have to retrieve (and replace), their path, their size, the number of strings found and the user id of the files. This view also provides the exact position of each match. The columns can be sorted either ascending or descending by clicking on the column headers.</para>
+ <para>The <guilabel>Results</guilabel> view shows the name of the files that contain the strings that match the search criterias, their path, their size, the number of strings found, the user and group of the files owner. This view also provides the exact position of each match. The columns can be sorted either ascending or descending by clicking on the column headers.</para>
<para>You can open a file by clicking with the &RMB; on a list entry, by single/double clicking (depending on your mouse settings) on an entry or alternatively by selecting an item and pressing Enter.</para>
-
+ <para>You can inspect the file properties using <guilabel>Properties</guilabel> from the &RMB; menu. You can also delete a file from the file system using <guilabel>Delete</guilabel> or simply remove the item from the results list using the <guilabel>Remove Entry</guilabel> command.</para>
</sect1>
<sect1 id="tdefilereplace-the-strings-view">
@@ -350,8 +320,7 @@
</screenshot>
</para>
- <para>The <guilabel>Strings</guilabel> view visualizes the list of strings you want search/replace. Please note that in search mode the <guilabel>Results</guilabel> view and the <guilabel>Strings</guilabel> view have a different layout.</para>
-
+ <para>The <guilabel>Strings</guilabel> view visualizes the list of strings you want to search for and eventually replace with. Please note that the layout of both the <guilabel>Results</guilabel> view and the <guilabel>Strings</guilabel> view is different if you are only searching or if you are searching and replacing.</para>
</sect1>
<sect1 id="tdefilereplace-the-project-dialog">
@@ -373,7 +342,7 @@
</mediaobject>
</screenshot>
<para>When you want to begin a new session the first step is to click on the <link linkend="tdefilereplace-the-toolbar"><guiicon>Customize Search/Replace Session</guiicon> button</link>. Then you must enter the base path and a sequence of shell-like wildcards to use as filter.</para>
- <para>Then you could set some useful options, like searching in all the subfolders, doing a case-sensitive search, enabling commands and/or regular expressions<footnote id="performancewarning"><para>Please note that regular expressions and commands could slow down the speed performances.</para></footnote>, doing a backup copy of each file before replacing.</para>
+ <para>Then you could set some useful options, like searching in all the subfolders including limiting the max depth of searching, doing a case-sensitive search, enabling commands and/or regular expressions<footnote id="performancewarning"><para>Please note that regular expressions and commands could slow down the speed performances.</para></footnote>, doing a backup copy of each file before replacing.</para>
<para>If you want to start searching, you can put a string in the search box and press <guibutton>Search Now</guibutton>, otherwise leave the search box empty and press <guibutton>Search Later</guibutton>.</para>
</sect2>
@@ -390,7 +359,7 @@
</textobject>
</mediaobject>
</screenshot>
- <para>The <guilabel>Advanced</guilabel> tab allows you to set up some useful options to restrict the search to a subset of your target file tree. If you want to run &tdefilereplace; only over files that have a size in the range of 10KB - 100KB, then you could use the size options. There is also a date option that restricts the search in a temporal range, and a last option that allows you to only search for files owned (or not owned) by a particular user (this may be more useful to the system administrators).</para>
+ <para>The <guilabel>Advanced</guilabel> tab allows you to set up some useful options to restrict the search to a subset of your target file tree. You can set restrictions on the size, access date and ownership of the files to be searched for.</para>
</sect2>
</sect1>
@@ -400,7 +369,7 @@
</para>
<sect2 id="tdefilereplace-the-options-dialog-general-page">
<title>General options</title>
- <para>These options have been presented in the <link linkend="tdefilereplace-the-toolbar">Toolbar</link> section.
+ <para>These options have been presented in the <link linkend="tdefilereplace-the-toolbar">Toolbar</link> section. In addition to those, you can specify the default file encoding to use and the suffix for backing up files.
<screenshot>
<screeninfo>The General tab of the Options window</screeninfo>
<mediaobject>
@@ -429,11 +398,13 @@
</mediaobject>
</screenshot>
<segmentedlist>
+ <segtitle>Confirm before replace each string</segtitle>
<segtitle>Do not show files if no strings are found or replaced</segtitle>
<segtitle>When searching, stop on first string found</segtitle>
<segtitle>Follow symbolic links</segtitle>
<segtitle>Ignore hidden files and directories</segtitle>
<seglistitem>
+ <seg>choose whether to confirm the replacement of each string or not.</seg>
<seg>shows only the files that match some of your strings. This will speed up the search.</seg>
<seg>&tdefilereplace; will stop when it finds a matching string, and will continue to search for other strings or, if you search for only one string, it will continue with the next file.</seg>
<seg>if a file is a link to another one, then search in the real file.</seg>
@@ -465,29 +436,26 @@
<para>This chapter provides informations about some useful capabilities of &tdefilereplace;.</para>
<sect1 id="tdefilereplace-the-kfr-file">
<title>How to save your string list</title>
- <para>When you want to reuse a list of strings you can save it in a <literal role="extension">xml</literal> file. To do this select from the menubar <menuchoice><guimenu>Search/Replace</guimenu><guisubmenu>Strings</guisubmenu><guimenuitem>Save Strings List to File</guimenuitem></menuchoice>. When you save a list, a simple <literal role="extension">xml</literal> file with extension <literal role="extension">kfr</literal> is created. To load a <literal role="extension">kfr</literal> file select from menubar <menuchoice><guimenu>Search/Replace</guimenu><guisubmenu>Strings</guisubmenu><guimenuitem>Load Strings List from File</guimenuitem></menuchoice>. The actual file looks like this:</para>
+ <para>When you want to reuse a list of strings you can save it in a <literal role="extension">xml</literal> file. To do this select from the menubar <menuchoice><guimenu>Search/Replace</guimenu><guisubmenu>Strings</guisubmenu><guimenuitem>Save Strings List to File...</guimenuitem></menuchoice>. When you save a list, a simple <literal role="extension">xml</literal> file with extension <literal role="extension">kfr</literal> is created. To load a <literal role="extension">kfr</literal> file select from menubar <menuchoice><guimenu>Search/Replace</guimenu><guisubmenu>Strings</guisubmenu><guimenuitem>Load Strings List from File...</guimenuitem></menuchoice>. The actual file looks like this:</para>
<screen>
&lt;?xml version="1.0" ?>
&lt;kfr>
&lt;mode search="false"/>
&lt;replacement>
- &lt;oldstring>&lt;![CDATA[SEARCH_STRING_1]&#93; >&lt;/oldstring>
- &lt;newstring>&lt;![CDATA[REPLACE_STRING_1]&#93;>&lt;/newstring>
+ &lt;oldstring>&lt;SEARCH_STRING_1>&lt;/oldstring>
+ &lt;newstring>&lt;REPLACE_STRING_1>&lt;/newstring>
&lt;/replacement>
&lt;replacement>
- &lt;oldstring>&lt;![CDATA[SEARCH_STRING_2]&#93;>&lt;/oldstring>
- &lt;newstring>&lt;![CDATA[REPLACE_STRING_2]&#93;>&lt;/newstring>
+ &lt;oldstring>&lt;SEARCH_STRING_2>&lt;/oldstring>
+ &lt;newstring>&lt;REPLACE_STRING_2>&lt;/newstring>
&lt;/replacement>
-
-
+ ...
+ ...
&lt;replacement>
- &lt;oldstring>&lt;![CDATA[SEARCH_STRING_N]&#93;>&lt;/oldstring>
- &lt;newstring>&lt;![CDATA[REPLACE_STRING_N]&#93;>&lt;/newstring>
+ &lt;oldstring>&lt;SEARCH_STRING_N>&lt;/oldstring>
+ &lt;newstring>&lt;REPLACE_STRING_N>&lt;/newstring>
&lt;/replacement>
-
&lt;/kfr></screen>
-
- <para>If you are using a previous format, you can update by hand your file by simply modifying it according to the above scheme. Alternatively, you can load the file written in the old format and save it again with &tdefilereplace; in the way explained before.</para>
</sect1>
<sect1 id="tdefilereplace-the-report-file">
@@ -499,15 +467,13 @@
<imageobject>
<imagedata fileref="report_example.png" format="PNG"/>
</imageobject>
- <imageobject>
- <imagedata fileref="report_example.eps" format="EPS"/>
- </imageobject>
<textobject>
<phrase>&tdefilereplace;'s Report feature</phrase>
</textobject>
</mediaobject>
</screenshot>
</para>
+ <para>You can also save and load the results list contents to/from file using the <menuchoice><guimenu>Search/Replace</guimenu><guisubmenu>Results</guisubmenu><guimenuitem>Save Results List to file...</guimenuitem></menuchoice> and <menuchoice><guimenu>Search/Replace</guimenu><guisubmenu>Results</guisubmenu><guimenuitem>Load Results List from file...</guimenuitem></menuchoice>. This is very useful if you are searching over a lot of files and for many strings, so you can save and resume your checks across multiple days.</para>
</sect1>
<sect1 id="tdefilereplace-QT-regexp">
@@ -524,7 +490,8 @@
<sect1 id="tdefilereplace-open-file">
<title>How to Open a File</title>
- <para>If you want to open a file that matches some of your strings, you have to select a line in the result view and click on it with the &RMB;. A context menu will appear from which you can open the file. If you use &tdefilereplace; embedded in &quantaplus;, you can open the file directly in it at the specified line and column.</para>
+ <para>You can open a file by clicking with the &RMB; on a list entry, by single/double clicking (depending on your mouse settings) on an entry or alternatively by selecting an item and pressing Enter. If you use &tdefilereplace; embedded in &quantaplus;, you can open the file directly in it at the specified line and column.</para>
+ <para></para>
</sect1>
<sect1 id="tdefilereplace-commands">
@@ -589,7 +556,7 @@ Documentation Copyright &copy; 2004 Emiliano Gulmini <email>emi_barbarossa&#64;y
<segtitle>[$random:$]</segtitle>
<segtitle>[$mathexp:<replaceable>bc-expression</replaceable>$]</segtitle>
<seglistitem>
- <seg>this command return the current date and time in Qt ISO format.</seg>
+ <seg>this command return the current date and time in TQt ISO format.</seg>
<seg>like above but in local format.</seg>
<seg>return the UID of the current user.</seg>
<seg>return the GID of the current user.</seg>
diff --git a/doc/tdefilereplace/kfr_standalone_main_window_1.png b/doc/tdefilereplace/kfr_standalone_main_window_1.png
deleted file mode 100644
index 9807894..0000000
--- a/doc/tdefilereplace/kfr_standalone_main_window_1.png
+++ /dev/null
Binary files differ
diff --git a/doc/tdefilereplace/optionsdialog_main_window_1.png b/doc/tdefilereplace/optionsdialog_main_window_1.png
index 892dd9b..b9ab36d 100644
--- a/doc/tdefilereplace/optionsdialog_main_window_1.png
+++ b/doc/tdefilereplace/optionsdialog_main_window_1.png
Binary files differ
diff --git a/doc/tdefilereplace/optionsdialog_main_window_2.png b/doc/tdefilereplace/optionsdialog_main_window_2.png
index 805a234..d457491 100644
--- a/doc/tdefilereplace/optionsdialog_main_window_2.png
+++ b/doc/tdefilereplace/optionsdialog_main_window_2.png
Binary files differ
diff --git a/doc/tdefilereplace/report_example.png b/doc/tdefilereplace/report_example.png
index db95360..b07f865 100644
--- a/doc/tdefilereplace/report_example.png
+++ b/doc/tdefilereplace/report_example.png
Binary files differ
diff --git a/doc/tdefilereplace/results_view.png b/doc/tdefilereplace/results_view.png
index c3ba24f..3cada52 100644
--- a/doc/tdefilereplace/results_view.png
+++ b/doc/tdefilereplace/results_view.png
Binary files differ
diff --git a/doc/tdefilereplace/strings_view.png b/doc/tdefilereplace/strings_view.png
index 91f5a53..ea7d670 100644
--- a/doc/tdefilereplace/strings_view.png
+++ b/doc/tdefilereplace/strings_view.png
Binary files differ
diff --git a/doc/tdefilereplace/tfr_standalone_main_window_1.png b/doc/tdefilereplace/tfr_standalone_main_window_1.png
new file mode 100644
index 0000000..71deccf
--- /dev/null
+++ b/doc/tdefilereplace/tfr_standalone_main_window_1.png
Binary files differ
diff --git a/doc/tdefilereplace/toolbar.png b/doc/tdefilereplace/toolbar.png
index a71f327..8368cf0 100644
--- a/doc/tdefilereplace/toolbar.png
+++ b/doc/tdefilereplace/toolbar.png
Binary files differ
diff --git a/kcalc/kcalc.desktop b/kcalc/kcalc.desktop
index 42419a9..849b1d5 100644
--- a/kcalc/kcalc.desktop
+++ b/kcalc/kcalc.desktop
@@ -1,23 +1,6 @@
[Desktop Entry]
Name=KCalc
-Name[af]=Kcalc
-Name[ar]=حاسبة ك
-Name[eo]=Kalkulilo
-Name[hi]=के-केल्क
-Name[lv]=KKalk
-Name[ne]=केडीई क्याल्क
-Name[pa]=ਕੇਹਿਸਾਬੀ
-Name[pl]=Kalkulator
-Name[sv]=Kcalc
-Name[ta]=கேகணிப்பான்
-Name[tg]=KМошинаи ҳисобкунак
-Name[th]=เครื่องคิดเลข
-Name[uz]=Kalkulyator
-Name[uz@cyrillic]=Калкулятор
-Name[zh_TW]=TDE 計算機
-Exec=kcalc -caption "%c" %i %m
-Icon=kcalc
-X-DocPath=kcalc/index.html
+
GenericName=Scientific Calculator
GenericName[af]=Wetenskaplike Sakrekenaar
GenericName[ar]=آلة حاسبة علمية
@@ -82,6 +65,10 @@ GenericName[xh]=Umatshini Wokubala Ezenzululwazi
GenericName[zh_CN]=科学计算器
GenericName[zh_TW]=科學計算機
GenericName[zu]=Umshini wokubala ezenzululwazi
+
+Exec=kcalc -caption "%c" %i %m
+Icon=kcalc
+X-DocPath=kcalc/index.html
Terminal=false
Type=Application
X-TDE-StartupNotify=true
diff --git a/kcharselect/KCharSelect.desktop b/kcharselect/KCharSelect.desktop
index 300a46e..3733548 100644
--- a/kcharselect/KCharSelect.desktop
+++ b/kcharselect/KCharSelect.desktop
@@ -1,4 +1,6 @@
[Desktop Entry]
+Name=KCharSelect
+
GenericName=Character Selector
GenericName[af]=Karakter Kiesser
GenericName[ar]=أداة اختيار الرموز
@@ -67,32 +69,12 @@ GenericName[xh]=Umkhethi womsebenzi
GenericName[zh_CN]=字符选择器
GenericName[zh_TW]=字元選擇器
GenericName[zu]=Umkhethi Womsebenzi
+
Exec=kcharselect -caption "%c" %i %m
Icon=kcharselect
-Path=
Type=Application
Terminal=false
X-DocPath=kcharselect/index.html
-Name=KCharSelect
-Name[af]=Kcharselect
-Name[cy]=KDewisNod
-Name[eo]=Signoelektilo
-Name[hi]=के-चर-सलेक्ट
-Name[ne]=केडीई क्यारेक्टर चयन
-Name[nl]=Speciale tekens
-Name[pa]=ਕਅੱਖਰਚੋਣਕਾਰ
-Name[pl]=Wybór znaków
-Name[pt_BR]=Seletor de caracteres
-Name[sr]=KChartSelect
-Name[sr@Latn]=KChartSelect
-Name[sv]=Kcharselect
-Name[ta]= கேஎழுத்துதேர்வு
-Name[tg]=KИнтихобгари Аломатҳо
-Name[th]=เลือกอักขระ
-Name[tr]=Karakter Seçici
-Name[ven]=U nanga muanewa wa K
-Name[xh]=Itshati yokukheta i K
-Name[zh_TW]=TDE 字元選擇
X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
Categories=Qt;TDE;Utility;
diff --git a/kdf/disklist.h b/kdf/disklist.h
index 926ca36..fe22dbf 100644
--- a/kdf/disklist.h
+++ b/kdf/disklist.h
@@ -37,7 +37,7 @@
#define DF_COMMAND "df"
// be pessimistic: df -T only works under linux !??
-#if defined(_OS_LINUX_)
+#if defined(_OS_LINUX_) || defined(__dilos__)
#define DF_ARGS "-kT"
#define NO_FS_TYPE false
#else
diff --git a/kdf/kdf.desktop b/kdf/kdf.desktop
index fdbd0ad..074fa7a 100644
--- a/kdf/kdf.desktop
+++ b/kdf/kdf.desktop
@@ -1,24 +1,7 @@
[Desktop Entry]
Name=KDiskFree
-Name[af]=Kdiskfree
-Name[eo]=Diskuzo
-Name[hi]=के-डिस्क-फ्री
-Name[lv]=KDiskāBrīvs
-Name[ne]=केडीई डिस्क खाली
-Name[pa]=ਕੇਡਿਸਕ ਥਾਂ
-Name[pl]=Wolna przestrzeń na dyskach
-Name[pt_BR]=Disco Livre
-Name[sl]=Prosti disk
-Name[sv]=Kdiskfree
-Name[ta]= கேடிஸ்க் இல்வசம்
-Name[tg]=KДиски Озод
-Name[th]=การใช้พื้นที่ดิสก์
-Name[tr]=K Disk Boşluğu
-Name[ven]=KDisiki ya mahala
-Name[zh_TW]=磁碟剩餘空間
-Exec=kdf -caption "%c"
-Icon=kdf
-Type=Application
+Name[hi]=केडिस्कफ्री
+
GenericName=View Disk Usage
GenericName[af]=Besigtig Disket Gebruik
GenericName[ar]=عرض المستخدم من القرص
@@ -28,7 +11,7 @@ GenericName[ca]=Veure l'ús de disc
GenericName[cs]=Zobrazení využití disku
GenericName[cy]=Gweld Defnydd y Disg
GenericName[da]=Se diskforbrug
-GenericName[de]=Festplattenbelegung etc. anzeigen
+GenericName[de]=Anzeige der Festplattenbelegung
GenericName[el]=Προβολή χρήσης του δίσκου
GenericName[eo]=Montras la okupitan kaj liberan spacon sur la diskoj
GenericName[es]=Muestra el uso del disco
@@ -81,6 +64,11 @@ GenericName[xh]=Jonga Ukusebenziseka KweDiskic
GenericName[zh_CN]=查看磁盘使用状况
GenericName[zh_TW]=檢視磁碟使用情形
GenericName[zu]= Buka Ukusetshenziswa Kwediski
+
+Exec=kdf -caption "%c"
+Icon=kdf
+Type=Application
+
Terminal=false
X-DocPath=kdf/index.html
X-TDE-StartupNotify=true
diff --git a/kedit/KEdit.desktop b/kedit/KEdit.desktop
index 52748c5..54e679c 100644
--- a/kedit/KEdit.desktop
+++ b/kedit/KEdit.desktop
@@ -1,5 +1,7 @@
[Desktop Entry]
-MimeType=text/plain;
+Name=KEdit
+Name[hi]=केएडिट
+
GenericName=Simple Text Editor
GenericName[ar]=محرر نصوص بسيط
GenericName[bg]=Текстов редактор
@@ -55,28 +57,14 @@ GenericName[uz@cyrillic]=Оддий матн таҳрирчи
GenericName[wa]=Simpe aspougneu di tecse
GenericName[zh_CN]=简单文本编辑器
GenericName[zh_TW]=簡單的文字編輯器
+
Exec=kedit -caption "%c" %i %m %u
Icon=kedit
-Path=
X-DocPath=kedit/index.html
Type=Application
Terminal=false
-Name=KEdit
-Name[af]=Kredigeer
-Name[eo]=Redaktilo
-Name[hi]=के-एडिट
-Name[hr]=Uređivač
-Name[lv]=KRediģēt
-Name[ne]=केडीई सम्पादन
-Name[pa]=ਕਸੰਪਦਾਕ
-Name[pl]=Edytor
-Name[sv]=Kedit
-Name[ta]=கேதொகுப்பு
-Name[tg]=KТаҳрир
-Name[th]=แก้ไขข้อความ
-Name[ven]=U sengulusa ha K
-Name[xh]=Abahleli Be K
-Name[zh_TW]=TDE 編輯器
+
+MimeType=text/plain;
X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
Categories=Qt;TDE;TextEditor;
diff --git a/kfloppy/KFloppy.desktop b/kfloppy/KFloppy.desktop
index d2f335e..28789d2 100644
--- a/kfloppy/KFloppy.desktop
+++ b/kfloppy/KFloppy.desktop
@@ -1,4 +1,7 @@
[Desktop Entry]
+Name=KFloppy
+Name[hi]=केफ़्लॉपी
+
GenericName=Floppy Formatter
GenericName[af]=Sagteskyf Formateerder
GenericName[ar]=مهئ الأقراص المرنة
@@ -10,7 +13,7 @@ GenericName[ca]=Formatador de disquet
GenericName[cs]=Formátovač disket
GenericName[cy]=Fformatio Disg Meddal
GenericName[da]=Disketteformatering
-GenericName[de]=Diskettenformatierer
+GenericName[de]=Diskettenformatierung
GenericName[el]=Εργαλείο διαμόρφωσης δισκέτας
GenericName[eo]=Formatilo por disketoj
GenericName[es]=Formateador de disquetes
@@ -68,27 +71,10 @@ GenericName[xh]=Floppy formata
GenericName[zh_CN]=软盘格式化程序
GenericName[zh_TW]=軟碟格式化程式
GenericName[zu]=Umakhi we-floppy
-Name=KFloppy
-Name[af]=Kfloppie
-Name[eo]=Disketingo
-Name[hi]=के-फ़्लॉपी
-Name[lv]=KMīkstnis
-Name[ne]=केडीई फ्लपी
-Name[pa]=ਕਫਲਾਪੀ
-Name[pl]=Dyskietka
-Name[pt_BR]=Disquete
-Name[sv]=Kfloppy
-Name[ta]=கேநெகிழ்வட்டு
-Name[tg]=KДиски Нарм
-Name[th]=ฟอร์แมตฟลอปปี้
-Name[tr]=Disket Biçimlendirici
-Name[wa]=KPlakete
-Name[zh_TW]=TDE 軟碟
-MimeType=
+
X-DocPath=kfloppy/index.html
Exec=kfloppy -caption "%c" %i %m
Icon=kfloppy
-Path=
Type=Application
Terminal=false
X-TDE-StartupNotify=true
diff --git a/kgpg/kgpg.desktop b/kgpg/kgpg.desktop
index 112088e..fc9f04e 100644
--- a/kgpg/kgpg.desktop
+++ b/kgpg/kgpg.desktop
@@ -1,9 +1,7 @@
[Desktop Entry]
-Type=Application
-Exec=kgpg %U
-Icon=kgpg
-X-DocPath=kgpg/index.html
-MimeType=application/pgp-encrypted;application/pgp-signature;application/pgp-keys;
+Name=KGpg
+Name[hi]=केजीपीजी
+
GenericName=Encryption Tool
GenericName[ar]=أداة للتشفير
GenericName[bg]=Програма за шифроване
@@ -56,6 +54,7 @@ GenericName[tr]=Şifreleme Aracı
GenericName[uk]=Засіб для шифрування
GenericName[zh_CN]=加密工具
GenericName[zh_TW]=加密工具
+
Comment=A GnuPG frontend
Comment[ar]=واجهة لـ GnuPG
Comment[bg]=Клиент за GnuPG
@@ -64,7 +63,7 @@ Comment[ca]=Un entorn gràfic per GnuPG
Comment[cs]=Rozhraní pro GnuPG
Comment[cy]=Blaen-wyneb GnuPG
Comment[da]=En GnuPG-forende
-Comment[de]=Eine Benutzeroberfläche für GnuPG
+Comment[de]=Eine Oberfläche für GnuPG
Comment[el]=Λογισμικό κρυπτογράφησης (GnuPG)
Comment[eo]=Fasado por GnuPG
Comment[es]=Interfaz para GnuPG
@@ -109,14 +108,16 @@ Comment[uz@cyrillic]=GnuPG учун график интерфейс
Comment[wa]=Ene eterface po GnuPG
Comment[zh_CN]=GnuPG 前端
Comment[zh_TW]=GnuPG 前端軟體
+
+Type=Application
+Exec=kgpg %U
+Icon=kgpg
+X-DocPath=kgpg/index.html
+MimeType=application/pgp-encrypted;application/pgp-signature;application/pgp-keys;
+
Terminal=false
-Name=KGpg
-Name[hi]=के-जीपीजी
-Name[nl]=KGPG
-Name[sv]=Kgpg
-Name[ta]= KGpg
X-TDE-autostart-after=panel
X-TDE-autostart-condition=kgpgrc:User Interface:AutoStart:false
-Categories=Qt;TDE;Office;X-TDE-Office-PIM;
+Categories=Qt;TDE;Utility; \ No newline at end of file
diff --git a/kgpg/kgpg.kcfg b/kgpg/kgpg.kcfg
index 6ee2417..00bd746 100644
--- a/kgpg/kgpg.kcfg
+++ b/kgpg/kgpg.kcfg
@@ -115,7 +115,7 @@
<default>false</default>
</entry>
<entry name="AutoStart" type="Bool">
- <label>Start KGpg automatically at KDE startup.</label>
+ <label>Start KGpg automatically at TDE startup.</label>
<default>false</default>
</entry>
<entry name="RemoteFileWarn" type="Bool" key="remote_file_warn">
diff --git a/khexedit/khexedit.desktop b/khexedit/khexedit.desktop
index edcd3d5..725c2a0 100644
--- a/khexedit/khexedit.desktop
+++ b/khexedit/khexedit.desktop
@@ -1,4 +1,7 @@
[Desktop Entry]
+Name=KHexEdit
+Name[hi]=केहेक्सएडिट
+
GenericName=Binary Editor
GenericName[af]=Binêre Redigeerder
GenericName[ar]=محرر ثنائى
@@ -62,25 +65,12 @@ GenericName[xh]=Umphathi Webhetri
GenericName[zh_CN]=二进制编辑器
GenericName[zh_TW]=二進位編輯器
GenericName[zu]=Umhleli Ohambisana ngambili
-Name=KHexEdit
-Name[af]=Khex-redigeerder
-Name[eo]=Deksesuma redaktilo
-Name[hi]=के-हेक्स-एडिट
-Name[pl]=Edytor binarny
-Name[pt_BR]=Editor Hexadecimal
-Name[sv]=Khexedit
-Name[ta]=KHexதொகுப்பு
-Name[th]=แก้ไขเลขฐาน
-Name[tr]=Onaltılı Düzenleyici
-Name[ven]=U sengulusa ha KHex
-Name[zh_TW]=KHex 編輯器
+
Exec=khexedit -caption "%c" %i %m %U
Icon=khexedit
-Path=
Type=Application
X-DocPath=khexedit/index.html
Terminal=false
X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
Categories=Qt;TDE;Development;
-
diff --git a/kjots/Kjots.desktop b/kjots/Kjots.desktop
index 4980053..3183506 100644
--- a/kjots/Kjots.desktop
+++ b/kjots/Kjots.desktop
@@ -1,15 +1,7 @@
[Desktop Entry]
-X-DocPath=kjots/index.html
Name=KJots
-Name[af]=Kjots
-Name[eo]=Notlibro
-Name[hi]=के-जॉट्स
-Name[hr]=Bilješke
-Name[pt_BR]=Tomador de notas
-Name[sv]=Kjots
-Name[ta]= KJots
-Name[th]=บันทึกช่วยจำ
-Name[xh]=Amaxabiso amancinane e K
+Name[hi]=केजॉट्स
+
GenericName=Note Taker
GenericName[af]=Nota Afnemer
GenericName[ar]=برنامج لأخذ الملاحظات
@@ -19,7 +11,7 @@ GenericName[ca]=Anotador
GenericName[cs]=Poznámkový blok
GenericName[cy]=Cofnodydd
GenericName[da]=Notetager
-GenericName[de]=Notizen machen
+GenericName[de]=Notizverwaltung
GenericName[el]=Καταγραφέας σημειώσεων
GenericName[eo]=Notolibro
GenericName[es]=Para tomar notas
@@ -70,10 +62,11 @@ GenericName[xh]=Umthathi Womakuqwalaselwe
GenericName[zh_CN]=笔记记录
GenericName[zh_TW]=筆記簡記
GenericName[zu]=Umthathi Wepheshana
+
+X-DocPath=kjots/index.html
Icon=kjots
Exec=kjots -caption "%c" %i %m
Type=Application
-Path=
Terminal=false
X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
diff --git a/klaptopdaemon/applnk/klaptopdaemon.desktop b/klaptopdaemon/applnk/klaptopdaemon.desktop
index c369af9..060f0bf 100644
--- a/klaptopdaemon/applnk/klaptopdaemon.desktop
+++ b/klaptopdaemon/applnk/klaptopdaemon.desktop
@@ -1,64 +1,4 @@
[Desktop Entry]
-Type=Service
-
-X-TDE-ServiceTypes=KDEDModule
-X-TDE-ModuleType=Library
-X-TDE-Library=klaptopdaemon
-X-TDE-FactoryName=klaptopdaemon
-X-TDE-Kded-autoload=false
-X-TDE-Kded-load-on-demand=true
-
-Icon=laptop_battery
-X-DocPath=kcontrol/battery-monitor.html
-Comment=Laptop battery monitor
-Comment[ar]=مراقب بطّاريّة الحاسوب المحمول
-Comment[bg]=Мониторинг на батериите на лаптоп
-Comment[bs]=Nadzor baterije laptopa
-Comment[ca]=Monitor de bateria de portàtils
-Comment[cs]=Monitor baterií laptopu
-Comment[da]=Batteriovervågning for bærbar
-Comment[de]=Benachrichtigung über den Akku-Ladezustand
-Comment[el]=Επόπτης μπαταρίας φορητού
-Comment[eo]=Portkomputila baterimonitoro
-Comment[es]=Monitor de batería del portátil
-Comment[et]=Sülearvuti aku monitooring
-Comment[eu]=Magalekoaren bateria begiralea
-Comment[fa]=نمایشگر باتری رایانۀ کیفی
-Comment[fi]=Kannettavan koneen akkutarkkailja
-Comment[fr]=Indicateur de batterie de portable
-Comment[ga]=Monatóir chadhnra ríomhaire glúine
-Comment[he]=מד סוללה למחשב ברכיים
-Comment[hu]=A telepek szintjelzője
-Comment[is]=Rafhlöðueftirlit fyrir ferðavélar
-Comment[it]=Controllo batteria computer portatile
-Comment[ja]=ラップトップバッテリモニタ
-Comment[ka]=ლეპტოპის კვების ელემენტის მონიტორი
-Comment[kk]=Ноутбук аккумуляторын бақылау
-Comment[km]=កម្មវិធី​ត្រួតពិនិត្យ​ថ្ម​របស់​កុំព្យូទ័រ​យួរដៃ
-Comment[lt]=Akumuliatoriaus stebėjimo priemonė
-Comment[nb]=Batteriovervåker for bærbar maskin
-Comment[nds]=Klappreekner-Batteriekieker
-Comment[ne]=ल्यापटप ब्याट्री मोनिटर
-Comment[nl]=Programma voor laptop-batterijbewaking
-Comment[nn]=Batteriovervaking for bærbar maskin
-Comment[pa]=ਲੈਪਟਾਪ ਬੈਟਰੀ ਨਿਗਰਾਨ
-Comment[pl]=Kontrola stanu baterii laptopa
-Comment[pt]=Monitor de bateria
-Comment[pt_BR]=Monitor de bateria de laptop
-Comment[ro]=Monitorează bateria laptop-ului
-Comment[ru]=Монитор состояния батареи
-Comment[sk]=Monitor nabitia bateriek
-Comment[sl]=Nadzornik baterije za prenosnik
-Comment[sr]=Надгледа батерију лаптопа
-Comment[sr@Latn]=Nadgleda bateriju laptopa
-Comment[sv]=Batterimonitor för bärbar dator
-Comment[ta]= மடிக் கணினி மின்கலம் கண்காணிப்பாளன்
-Comment[tr]=Dizüstü bilgisayarlar için pil izleyici
-Comment[uk]=Монітор батарей лептопа
-Comment[uz]=Laptopning batareyasini nazorat qilish
-Comment[uz@cyrillic]=Лаптопнинг батареясини назорат қилиш
-Comment[zh_CN]=便携电脑电池监视器
-Comment[zh_TW]=筆記型電腦電池監視器
Name=Laptop Battery Monitor
Name[ar]=مراقب بطّاريّة الحاسوب المحمول
Name[bg]=Мониторинг на батериите
@@ -67,7 +7,7 @@ Name[ca]=Monitor de bateria de portàtils
Name[cs]=Monitor baterií laptopu
Name[cy]=Monitr Batri Gliniadur
Name[da]=Batteriovervågning for bærbar
-Name[de]=Akku-Überwachung
+Name[de]=Akkuüberwachung
Name[el]=Επόπτης μπαταρίας φορητού
Name[eo]=Portkomputila baterimonitoro
Name[es]=Monitor de batería del portátil
@@ -114,3 +54,65 @@ Name[uz@cyrillic]=Лаптопнинг батареясини назорат қ
Name[wa]=Corwaitoe del batreye do poirtåve
Name[zh_CN]=便携电脑电池监视器
Name[zh_TW]=筆記型電腦電池監視器
+
+Comment=Laptop battery monitor
+Comment[ar]=مراقب بطّاريّة الحاسوب المحمول
+Comment[bg]=Мониторинг на батериите на лаптоп
+Comment[bs]=Nadzor baterije laptopa
+Comment[ca]=Monitor de bateria de portàtils
+Comment[cs]=Monitor baterií laptopu
+Comment[da]=Batteriovervågning for bærbar
+Comment[de]=Benachrichtigung über den Akkuladezustand
+Comment[el]=Επόπτης μπαταρίας φορητού
+Comment[eo]=Portkomputila baterimonitoro
+Comment[es]=Monitor de batería del portátil
+Comment[et]=Sülearvuti aku monitooring
+Comment[eu]=Magalekoaren bateria begiralea
+Comment[fa]=نمایشگر باتری رایانۀ کیفی
+Comment[fi]=Kannettavan koneen akkutarkkailja
+Comment[fr]=Indicateur de batterie de portable
+Comment[ga]=Monatóir chadhnra ríomhaire glúine
+Comment[he]=מד סוללה למחשב ברכיים
+Comment[hu]=A telepek szintjelzője
+Comment[is]=Rafhlöðueftirlit fyrir ferðavélar
+Comment[it]=Controllo batteria computer portatile
+Comment[ja]=ラップトップバッテリモニタ
+Comment[ka]=ლეპტოპის კვების ელემენტის მონიტორი
+Comment[kk]=Ноутбук аккумуляторын бақылау
+Comment[km]=កម្មវិធី​ត្រួតពិនិត្យ​ថ្ម​របស់​កុំព្យូទ័រ​យួរដៃ
+Comment[lt]=Akumuliatoriaus stebėjimo priemonė
+Comment[nb]=Batteriovervåker for bærbar maskin
+Comment[nds]=Klappreekner-Batteriekieker
+Comment[ne]=ल्यापटप ब्याट्री मोनिटर
+Comment[nl]=Programma voor laptop-batterijbewaking
+Comment[nn]=Batteriovervaking for bærbar maskin
+Comment[pa]=ਲੈਪਟਾਪ ਬੈਟਰੀ ਨਿਗਰਾਨ
+Comment[pl]=Kontrola stanu baterii laptopa
+Comment[pt]=Monitor de bateria
+Comment[pt_BR]=Monitor de bateria de laptop
+Comment[ro]=Monitorează bateria laptop-ului
+Comment[ru]=Монитор состояния батареи
+Comment[sk]=Monitor nabitia bateriek
+Comment[sl]=Nadzornik baterije za prenosnik
+Comment[sr]=Надгледа батерију лаптопа
+Comment[sr@Latn]=Nadgleda bateriju laptopa
+Comment[sv]=Batterimonitor för bärbar dator
+Comment[ta]= மடிக் கணினி மின்கலம் கண்காணிப்பாளன்
+Comment[tr]=Dizüstü bilgisayarlar için pil izleyici
+Comment[uk]=Монітор батарей лептопа
+Comment[uz]=Laptopning batareyasini nazorat qilish
+Comment[uz@cyrillic]=Лаптопнинг батареясини назорат қилиш
+Comment[zh_CN]=便携电脑电池监视器
+Comment[zh_TW]=筆記型電腦電池監視器
+
+Type=Service
+
+X-TDE-ServiceTypes=KDEDModule
+X-TDE-ModuleType=Library
+X-TDE-Library=klaptopdaemon
+X-TDE-FactoryName=klaptopdaemon
+X-TDE-Kded-autoload=false
+X-TDE-Kded-load-on-demand=true
+
+Icon=laptop_battery
+X-DocPath=kcontrol/battery-monitor.html \ No newline at end of file
diff --git a/klaptopdaemon/applnk/laptop.desktop b/klaptopdaemon/applnk/laptop.desktop
index ba9d472..35e0a2f 100644
--- a/klaptopdaemon/applnk/laptop.desktop
+++ b/klaptopdaemon/applnk/laptop.desktop
@@ -1,74 +1,4 @@
[Desktop Entry]
-X-TDE-Library=laptop
-X-TDE-FactoryName=laptop
-X-TDE-Init=laptop
-Exec=tdecmshell laptop
-Icon=laptop_battery
-Type=Application
-X-DocPath=kcontrol/laptop/index.html
-Categories=Qt;TDE;X-TDE-settings-hardware;
-Comment=Laptop Battery
-Comment[af]=Draagbare rekenaar Batery
-Comment[ar]=بطّاريّة الحاسوب المحمول
-Comment[bg]=Мониторинг на батериите на лаптоп
-Comment[br]=Pod-tredan an hezoug
-Comment[bs]=Upozorenje istrošene baterije
-Comment[ca]=Bateria de portàtil
-Comment[cs]=Baterie notebooku
-Comment[cy]=Batri Gliniadur
-Comment[da]=Batteri for bærbar
-Comment[de]=Notebook-Akku
-Comment[el]=Μπαταρία φορητού
-Comment[eo]=Avertilo por maplenigo de la baterio
-Comment[es]=Batería del portátil
-Comment[et]=Sülearvuti aku
-Comment[eu]=Magalekoen Bateria
-Comment[fa]=باتری رایانۀ کیفی
-Comment[fi]=Kannettavan akku
-Comment[fr]=Batterie d'ordinateur portable
-Comment[ga]=Cadhnra Ríomhaire Glúine
-Comment[he]=סוללת מחשב נייד
-Comment[hi]=लैपटॉप बैटरी
-Comment[hr]=Baterija laptopa
-Comment[hu]=Energiakezelési beállítások noteszgép esetén
-Comment[is]=Rafhlaða ferðavélar
-Comment[it]=Batteria computer portatile
-Comment[ja]=ラップトップバッテリ
-Comment[ka]=ლეპტოპის კვების ელემენტი
-Comment[kk]=Ноутбуктің аккумуляторы
-Comment[km]=ថ្ម​កុំព្យូទ័រ​យួរដៃ
-Comment[lt]=Nešiojamo kompiuterio akumuliatorius
-Comment[mk]=Предупредува кога батеријата е слаба
-Comment[ms]=Bateri Komputer Riba
-Comment[mt]=Batterija tal-laptop
-Comment[nb]=Batteri til bærbar maskin
-Comment[nds]=Klappreekner-Batterie
-Comment[ne]=ल्यापटप ब्याट्री
-Comment[nl]=Laptopbatterij
-Comment[nn]=Batteri til bærbar
-Comment[pa]=ਲੈਪਟਾਪ ਬੈਟਰੀ
-Comment[pl]=Ostrzeżenie o słabych bateriach
-Comment[pt]=Bateria do portátil
-Comment[pt_BR]=Bateria do Laptop
-Comment[ro]=Baterie de laptop
-Comment[ru]=Батарея ноутбука
-Comment[sk]=Batérie laptopu
-Comment[sl]=Baterija prenosnika
-Comment[sr]=Батерија лаптопа
-Comment[sr@Latn]=Baterija laptopa
-Comment[sv]=Batteri för bärbar dator
-Comment[ta]= மடிக் கணினி மின்கலம்
-Comment[tg]=Батареяи Компютери Дастӣ
-Comment[th]=แบตเตอรีของเครื่องแลปทอบ
-Comment[tr]=Dizüstü Pili
-Comment[uk]=Батареї лептопа
-Comment[uz]=Laptopning batareyasi
-Comment[uz@cyrillic]=Лаптопнинг батареяси
-Comment[wa]=Batreye do poirtåve
-Comment[xh]=Ibhetri ye Laptop
-Comment[zh_CN]=便携电脑电池
-Comment[zh_TW]=筆記型電腦的電池
-Comment[zu]=Ibhetri Yekhomputha eyisicaba ephathwayo
Name=Laptop Battery
Name[af]=Draagbare rekenaar Batery
Name[ar]=بطّاريّة الحاسوب المحمول
@@ -79,7 +9,7 @@ Name[ca]=Bateria de portàtil
Name[cs]=Baterie notebooku
Name[cy]=Batri Gliniadur
Name[da]=Batteri for bærbar
-Name[de]=Notebook-Akku
+Name[de]=Notebookakku
Name[el]=Μπαταρία φορητού
Name[eo]=Portkomputila baterio
Name[es]=Batería del portátil
@@ -131,5 +61,77 @@ Name[xh]=Ibhetri ye Laptop
Name[zh_CN]=便携电脑电池
Name[zh_TW]=筆記型電腦的電池
Name[zu]=Ibhetri Yekhomputha eyisicaba ephathwayo
+
+Comment=Laptop Battery
+Comment[af]=Draagbare rekenaar Batery
+Comment[ar]=بطّاريّة الحاسوب المحمول
+Comment[bg]=Мониторинг на батериите на лаптоп
+Comment[br]=Pod-tredan an hezoug
+Comment[bs]=Upozorenje istrošene baterije
+Comment[ca]=Bateria de portàtil
+Comment[cs]=Baterie notebooku
+Comment[cy]=Batri Gliniadur
+Comment[da]=Batteri for bærbar
+Comment[de]=Notebookakku
+Comment[el]=Μπαταρία φορητού
+Comment[eo]=Avertilo por maplenigo de la baterio
+Comment[es]=Batería del portátil
+Comment[et]=Sülearvuti aku
+Comment[eu]=Magalekoen Bateria
+Comment[fa]=باتری رایانۀ کیفی
+Comment[fi]=Kannettavan akku
+Comment[fr]=Batterie d'ordinateur portable
+Comment[ga]=Cadhnra Ríomhaire Glúine
+Comment[he]=סוללת מחשב נייד
+Comment[hi]=लैपटॉप बैटरी
+Comment[hr]=Baterija laptopa
+Comment[hu]=Energiakezelési beállítások noteszgép esetén
+Comment[is]=Rafhlaða ferðavélar
+Comment[it]=Batteria computer portatile
+Comment[ja]=ラップトップバッテリ
+Comment[ka]=ლეპტოპის კვების ელემენტი
+Comment[kk]=Ноутбуктің аккумуляторы
+Comment[km]=ថ្ម​កុំព្យូទ័រ​យួរដៃ
+Comment[lt]=Nešiojamo kompiuterio akumuliatorius
+Comment[mk]=Предупредува кога батеријата е слаба
+Comment[ms]=Bateri Komputer Riba
+Comment[mt]=Batterija tal-laptop
+Comment[nb]=Batteri til bærbar maskin
+Comment[nds]=Klappreekner-Batterie
+Comment[ne]=ल्यापटप ब्याट्री
+Comment[nl]=Laptopbatterij
+Comment[nn]=Batteri til bærbar
+Comment[pa]=ਲੈਪਟਾਪ ਬੈਟਰੀ
+Comment[pl]=Ostrzeżenie o słabych bateriach
+Comment[pt]=Bateria do portátil
+Comment[pt_BR]=Bateria do Laptop
+Comment[ro]=Baterie de laptop
+Comment[ru]=Батарея ноутбука
+Comment[sk]=Batérie laptopu
+Comment[sl]=Baterija prenosnika
+Comment[sr]=Батерија лаптопа
+Comment[sr@Latn]=Baterija laptopa
+Comment[sv]=Batteri för bärbar dator
+Comment[ta]= மடிக் கணினி மின்கலம்
+Comment[tg]=Батареяи Компютери Дастӣ
+Comment[th]=แบตเตอรีของเครื่องแลปทอบ
+Comment[tr]=Dizüstü Pili
+Comment[uk]=Батареї лептопа
+Comment[uz]=Laptopning batareyasi
+Comment[uz@cyrillic]=Лаптопнинг батареяси
+Comment[wa]=Batreye do poirtåve
+Comment[xh]=Ibhetri ye Laptop
+Comment[zh_CN]=便携电脑电池
+Comment[zh_TW]=筆記型電腦的電池
+Comment[zu]=Ibhetri Yekhomputha eyisicaba ephathwayo
+
Init=klaptop_check
+X-TDE-Library=laptop
+X-TDE-FactoryName=laptop
+X-TDE-Init=laptop
+Exec=tdecmshell laptop
+Icon=laptop_battery
+Type=Application
+X-DocPath=kcontrol/laptop/index.html
+Categories=Qt;TDE;X-TDE-settings-hardware; \ No newline at end of file
diff --git a/klaptopdaemon/applnk/pcmcia.desktop b/klaptopdaemon/applnk/pcmcia.desktop
index 1fb946c..788a4fd 100644
--- a/klaptopdaemon/applnk/pcmcia.desktop
+++ b/klaptopdaemon/applnk/pcmcia.desktop
@@ -1,12 +1,10 @@
[Desktop Entry]
-X-TDE-ModuleType=Library
-X-TDE-Library=laptop
-X-TDE-FactoryName=pcmcia
-X-TDE-ParentApp=kcontrol
-Exec=tdecmshell pcmcia
-Icon=laptop_pcmcia
-Type=Application
-X-DocPath=kcontrol/pcmcia/index.html
+Name=PCMCIA cards
+Name=PCMCIA-Karten
+Name[hi]=पीसीएमसीआईए
+Name[pt_BR]=Cartões PCMCIA
+Name[th]=อุปกรณ์ PCMCIA
+
Comment=PCMCIA status
Comment[af]=Pcmcia status
Comment[ar]=حالة بطاقة PCMCIA
@@ -17,7 +15,7 @@ Comment[ca]=Estat de PCMCIA
Comment[cs]=Stav PCMCIA
Comment[cy]=Statws PCMCIA
Comment[da]=PCMCIA-status
-Comment[de]=PCMCIA-Status
+Comment[de]=Zustand von PCMCIA-Karten
Comment[el]=Κατάσταση PCMCIA
Comment[eo]=PCMCIA-stato
Comment[es]=Estado PCMCIA
@@ -74,12 +72,14 @@ Comment[xh]=Indawo esemthethweni ye PCMCIA
Comment[zh_CN]=PCMCIA 状态
Comment[zh_TW]=PCMCIA 狀態
Comment[zu]=Izinga le-PCMCIA
-Name=PCMCIA
-Name[af]=Pcmcia
-Name[he]=מצב PCMCIA
-Name[hi]=पीसीएमसीआईए
-Name[pt_BR]=Cartões PCMCIA
-Name[ta]= PCMCIA
-Name[th]=อุปกรณ์ PCMCIA
+
+X-TDE-ModuleType=Library
+X-TDE-Library=laptop
+X-TDE-FactoryName=pcmcia
+X-TDE-ParentApp=kcontrol
+Exec=tdecmshell pcmcia
+Icon=laptop_pcmcia
+Type=Application
+X-DocPath=kcontrol/pcmcia/index.html
Categories=Qt;TDE;X-TDE-settings-information;
diff --git a/kmilo/asus/kmilo_asus.desktop b/kmilo/asus/kmilo_asus.desktop
index a7dc356..6cf046d 100644
--- a/kmilo/asus/kmilo_asus.desktop
+++ b/kmilo/asus/kmilo_asus.desktop
@@ -1,7 +1,4 @@
[Desktop Entry]
-Type=Service
-X-TDE-ServiceTypes=KMilo Plugin
-X-TDE-ModuleType=Plugin
Name=Asus Laptop Plugin
Name[ar]=ملحق حاسوب Asus المحمول
Name[br]=Lugent hezoug Asus
@@ -9,7 +6,7 @@ Name[bs]=Dodatak za Asus laptope
Name[ca]=Connector per portàtils Asus
Name[cs]=Asus Laptop modul
Name[da]=Asus bærbar plugin
-Name[de]=Asus Notebook-Plugin
+Name[de]=Zusatzmodul für Asus Notebooks
Name[el]=Πρόσθετο Sony Vaio
Name[es]=Extensión para el portátil Asus
Name[et]=Asuse sülearvuti plugin
@@ -49,6 +46,7 @@ Name[uz]=Asus laptopi uchun plagin
Name[uz@cyrillic]=Asus лаптопи учун плагин
Name[zh_CN]=华硕笔记本插件
Name[zh_TW]=華碩筆記型電腦外掛程式
+
Comment=Enables support for special Asus laptop keys
Comment[ar]=تمكّن الدعم لمفاتيح حاسوب Asus المحمول الخاصة
Comment[bg]=Тази приставка позволява поддръжката на специалните клавиши на Asus
@@ -56,7 +54,7 @@ Comment[bs]=Omogućuje podršku za posebne tipke na Asus laptopima
Comment[ca]=Habilita el funcionament per a tecles especials dels portàtils Asus
Comment[cs]=Umožňuje podporu speciálních kláves laptopů Asus
Comment[da]=Aktiverer støtte for specielle Asus bærbares taster
-Comment[de]=Dieses Plugin aktiviert die Unterstützung für Sondertasten bei Asus-Tastaturen
+Comment[de]=Aktiviert die Unterstützung für Sondertasten bei Asus Notebooks
Comment[el]=Ενεργοποιεί την υποστήριξη για ειδικά πλήκτρα φορητού Asus
Comment[es]=Activa el soporte de las teclas especiales del portátil Asus
Comment[et]=Võimaldab kasutada Asuse sülearvuti eriklahve
@@ -94,4 +92,9 @@ Comment[tr]=Asus dizüstü bilgisayarlar için özel tuş desteğini etkinleşti
Comment[uk]=Уможливлює підтримку спеціальних клавіш для лептопа Asus
Comment[zh_CN]=启用华硕笔记本的特殊按键
Comment[zh_TW]=開啟華碩筆記型電腦特殊鍵支援
+
+Type=Service
+X-TDE-ServiceTypes=KMilo Plugin
+X-TDE-ModuleType=Plugin
+
X-TDE-Library=kmilo_asus
diff --git a/kmilo/delli8k/kmilo_delli8k.desktop b/kmilo/delli8k/kmilo_delli8k.desktop
index 85d4402..9055c02 100644
--- a/kmilo/delli8k/kmilo_delli8k.desktop
+++ b/kmilo/delli8k/kmilo_delli8k.desktop
@@ -1,7 +1,4 @@
[Desktop Entry]
-Type=Service
-X-TDE-ServiceTypes=KMilo Plugin
-X-TDE-ModuleType=Plugin
Name=Dell I8k Laptop Plugin
Name[ar]=ملحق حاسوب Dell I8k المحمول
Name[br]=Lugent hezoug Dell I8k
@@ -9,7 +6,7 @@ Name[bs]=Dodatak za Dell I8k laptope
Name[ca]=Connector per portàtils Dell I8k
Name[cs]=Dell I8k Laptop modul
Name[da]=Dell I8k bærbar plugin
-Name[de]=Dell I8k Notebook-Plugin
+Name[de]=Zusatzmodul für Dell I8k Notebooks
Name[el]=Πρόσθετο φορητού Dell I8k
Name[es]=Extensión para el portátil Dell I8k
Name[et]=Dell I8k sülearvuti plugin
@@ -49,6 +46,7 @@ Name[uz]=Dell I8k laptopi uchun plagin
Name[uz@cyrillic]=Dell I8k лаптопи учун плагин
Name[zh_CN]=Dell I8k 笔记本插件
Name[zh_TW]=Dell I8k 筆記型電腦外掛程式
+
Comment=Enables support for special Dell laptop keys
Comment[ar]=تمكّن الدعم لمفاتيح حاسوب Dell المحمول الخاصة
Comment[bg]=Тази приставка позволява поддръжката на специалните клавиши на Dell
@@ -56,7 +54,7 @@ Comment[bs]=Omogućuje podršku za posebne tipke na Dell laptopima
Comment[ca]=Habilita el funcionament per a tecles especials dels portàtils Dell
Comment[cs]=Umožňuje podporu speciálních kláves laptopů Dell
Comment[da]=Aktiverer støtte for specielle Dell bærbares taster
-Comment[de]=Dieses Plugin aktiviert die Unterstützung für Sondertasten bei Dell-Notebook-Tastaturen
+Comment[de]=Aktiviert die Unterstützung für Sondertasten bei Dell Notebooks
Comment[el]=Ενεργοποιεί την υποστήριξη για ειδικά πλήκτρα φορητού Dell
Comment[es]=Activa el soporte de las teclas especiales del portátil Dell
Comment[et]=Võimaldab kasutada Delli sülearvuti eriklahve
@@ -93,4 +91,9 @@ Comment[tr]=Dell dizüstü bilgisayarların özel tuşları için desteği etkin
Comment[uk]=Уможливлює підтримку спеціальних клавіш для лептопа Dell
Comment[zh_CN]=此插件启用 Dell 笔记本的特殊按键
Comment[zh_TW]=開啟 Dell 筆記型電腦特殊鍵支援
+
+Type=Service
+X-TDE-ServiceTypes=KMilo Plugin
+X-TDE-ModuleType=Plugin
+
X-TDE-Library=kmilo_delli8k
diff --git a/kmilo/demo/kmilo_demo.desktop b/kmilo/demo/kmilo_demo.desktop
index 39f28fb..09c77de 100644
--- a/kmilo/demo/kmilo_demo.desktop
+++ b/kmilo/demo/kmilo_demo.desktop
@@ -1,14 +1,11 @@
[Desktop Entry]
-Type=Service
-X-TDE-ServiceTypes=KMilo Plugin
-X-TDE-ModuleType=Plugin
Name=Demo Plugin
Name[ar]=ملحق للعرض
Name[bg]=Демонстрационна приставка
Name[ca]=Connector demo
Name[cy]=Ategyn Arddangosiad
Name[da]=Demo-plugin
-Name[de]=Demo-Plugin
+Name[de]=Zusatzmodul für Testzwecke
Name[el]=Πρόσθετο επίδειξης
Name[eo]=Demo-kromaĵo
Name[es]=Extensión de demostración
@@ -53,14 +50,15 @@ Name[uz@cyrillic]=Демо плагини
Name[wa]=Tchôke-divins di mostraedje
Name[zh_CN]=演示插件
Name[zh_TW]=示範用外掛程式
-Comment=This plugin does nothing.
+
+Comment=Does nothing
Comment[ar]=لا يفعل هذا الملحق أى شئ..
Comment[bg]=Тази приставка не прави нищо
Comment[bs]=Ovaj dodatak ne radi ništa.
Comment[ca]=Aquest connector no fa res.
Comment[cy]=Nid yw'r ategyn yma yn gwneud unrhyw beth.
Comment[da]=Dette plugin gør ingenting.
-Comment[de]=Dieses Plugin macht nichts.
+Comment[de]=Macht nichts
Comment[el]=Αυτό το πρόσθετο δεν κάνει τίποτα.
Comment[eo]=Tiu kromaĵo faras nenion.
Comment[es]=Esta extensión no hace nada.
@@ -107,4 +105,9 @@ Comment[uz@cyrillic]=Бу плагин ҳеч нарса бажармайди.
Comment[wa]=Ci tchôke-divins chal ni fwait rén do tot.
Comment[zh_CN]=此插件不完成任何工作。
Comment[zh_TW]=這個外掛程式不做任何事。
+
+Type=Service
+X-TDE-ServiceTypes=KMilo Plugin
+X-TDE-ModuleType=Plugin
+
X-TDE-Library=kmilo_demo
diff --git a/kmilo/generic/kmilo_generic.desktop b/kmilo/generic/kmilo_generic.desktop
index 3cbfc0c..ede2c6c 100644
--- a/kmilo/generic/kmilo_generic.desktop
+++ b/kmilo/generic/kmilo_generic.desktop
@@ -1,7 +1,4 @@
[Desktop Entry]
-Type=Service
-X-TDE-ServiceTypes=KMilo Plugin
-X-TDE-ModuleType=Plugin
Name=Generic Keyboard Plugin
Name[ar]=ملحق عام للوحة المفاتيح
Name[bg]=Приставка за клавиатурата
@@ -10,7 +7,7 @@ Name[ca]=Connector de teclat genèric
Name[cs]=Obecný modul klávesnice
Name[cy]=Ategyn Bysellfwrdd Cyffredinol
Name[da]=Generisk tastatur-plugin
-Name[de]=Allgemeines Tastatur-Plugin
+Name[de]=Allgemeines Zusatzmodul für Tastaturen
Name[el]=Γενικευμένο πρόσθετο πληκτρολογίου
Name[eo]=Komuna klavar-kromprogramo
Name[es]=Extensión de teclado genérico
@@ -56,7 +53,8 @@ Name[uz@cyrillic]=Умумий тугматаг плагини
Name[wa]=Tchôke-divins djenerike di taprece
Name[zh_CN]=常规键盘插件
Name[zh_TW]=一般鍵盤外掛程式
-Comment=This plugin enables support for special keys on all sorts of keyboards and laptops.
+
+Comment=Enables support for special keys on all sorts of keyboards and laptops
Comment[ar]=تمكّن الدعم للمفاتيح الخاصة فى كل أنواع لوحات المفاتيح والحواسيب المحمولة.
Comment[bg]=Тази приставка позволява поддръжката на специалните клавиши на различните видове лаптопи и специални клавиатури
Comment[bs]=Ovaj dodatak (plugin) omogućuje podršku za posebne tipke na raznim vrstama tastatura i laptopa.
@@ -64,7 +62,7 @@ Comment[ca]=Aquest connector activa el funcionament per a tecles especials en to
Comment[cs]=Tento modul umožňuje používat zvláštní klávesy na všech typech klávesnic a notebooků.
Comment[cy]=Mae'r ategyn yn galluogi cynhaliaeth ar gyfer bysyll arbennig ar bob math o bysellfyrdd a gluniaduron.
Comment[da]=Dette plugin aktivere støtte for specielle taster på alle slags tastaturer og bærbare.
-Comment[de]=Dieses Plugin aktiviert die Unterstützung für die Sondertasten diverser Tastaturen und Notebooks.
+Comment[de]=Aktiviert die Unterstützung für die Sondertasten verschiedener Tastaturen und Notebooks
Comment[el]=Αυτό το πρόσθετο ενεργοποιεί την υποστήριξη για ειδικά πλήκτρα σε όλα τα είδη των πληκτρολογίων και φορητών υπολογιστών.
Comment[es]=Esta extensión activa el soporte de las teclas especiales en todo tipo de teclados y portátiles.
Comment[et]=See plugin võimaldab kasutada eriklahve igasugustel klaviatuuridel ja sülearvutitel.
@@ -105,4 +103,9 @@ Comment[tr]=Bu plugin tüm klavye ve dizüstülerdeki özel tuşlar için deste
Comment[uk]=Цей втулок додає підтримку спеціальних клавіш для різних типів клавіатур та лептопів.
Comment[zh_CN]=此插件启用各种键盘和便携电脑的特殊按键。
Comment[zh_TW]=這個外掛程式開啟所有鍵盤與筆記型電腦的特殊鍵支援。
+
+Type=Service
+X-TDE-ServiceTypes=KMilo Plugin
+X-TDE-ModuleType=Plugin
+
X-TDE-Library=kmilo_generic
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop b/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop
index fee39ca..294970b 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop
+++ b/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop
@@ -1,12 +1,4 @@
[Desktop Entry]
-Type=Application
-Exec=tdecmshell kvaio
-Icon=laptop
-X-DocPath=kcontrol/kvaio/index.html
-
-X-TDE-Library=kvaio
-X-TDE-ParentApp=kcontrol
-
Name=Sony Vaio Laptop
Name[ar]=حاسوب سونى فايو المحمولة
Name[bg]=Лаптоп Sony Vaio
@@ -55,6 +47,7 @@ Name[uz]=Sony Vaio laptopi
Name[uz@cyrillic]=Sony Vaio лаптопи
Name[zh_CN]=索尼 Vaio 插件
Name[zh_TW]=Sony Vaio 筆記型電腦
+
Comment=Configure the TDE Interface to the Sony Programmable Interrupt Controller Driver
Comment[ar]=إعداد واجهة كدى لجهاز لمشغل التحكّم بالمقاطعة القابل للبرمجة من سونى
Comment[bg]=Настройване на Sony Programmable Interrupt Controller Driver
@@ -102,12 +95,13 @@ Comment[tr]=TDE arayüzünü Sony Programlanabilir Kesilme Kontrolör Sürücüs
Comment[uk]=Налаштування інтерфейсу TDE до драйвера перепин Sony
Comment[zh_CN]=配置 TDE 界面使用索尼可编程中断控制器驱动程序
Comment[zh_TW]=設定 Sony 可編程中斷控制器驅動程式的 TDE 介面
+
Keywords=Sony; Vaio; kvaio; brightness; mute; Jog Dial;
Keywords[ca]=Sony; Vaio; kvaio; brillantor; silenci; Jog Dial;
Keywords[cs]=Sony;Vaio;kvaio;jas;ztlumení;Jog Dial;
Keywords[cy]=Sony; Vaio; kvaio; gloywder; mud; Jog Dial;
Keywords[da]=Sony; Vaio; kvaio; lysstyrke; stum; Jog Dial;
-Keywords[de]=Sony; Vaio; kvaio; brightness; mute; Jog Dial; stumm; hell; dunkel;
+Keywords[de]=Sony; Vaio; kvaio; helligkeit; stumm; Jog Dial; stumm; hell; dunkel;
Keywords[el]=Sony; Vaio; kvaio; φωτεινότητα; κλείσιμο ήχου; Jog Dial;
Keywords[es]=Sony; Vaio; kvaio; brillo; mute; Jog Dial;
Keywords[et]=Sony; Vaio; kvaio; heledus; tumm; Jog Dial;
@@ -143,4 +137,12 @@ Keywords[tr]=Sony; Vaio; kvaio; parlaklık; sessiz; gösterme itmesi;
Keywords[uk]=Sony; Vaio; kvaio; яскравість; вимкнення звуку;
Keywords[zh_CN]=Sony; Vaio; kvaio; brightness; mute; Jog Dial;索尼;亮度;静音;
+Type=Application
+Exec=tdecmshell kvaio
+Icon=laptop
+X-DocPath=kcontrol/kvaio/index.html
+
+X-TDE-Library=kvaio
+X-TDE-ParentApp=kcontrol
+
Categories=Qt;TDE;X-TDE-settings-system;
diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.desktop b/kmilo/kmilo_kvaio/kmilo_kvaio.desktop
index 7e48936..054deb0 100644
--- a/kmilo/kmilo_kvaio/kmilo_kvaio.desktop
+++ b/kmilo/kmilo_kvaio/kmilo_kvaio.desktop
@@ -1,8 +1,5 @@
[Desktop Entry]
-Type=Service
-X-TDE-ServiceTypes=KMilo Plugin
-X-TDE-ModuleType=Plugin
-Name=Sony Vaio Plugin
+Name=Sony Vaio Laptop Plugin
Name[ar]=ملحق سونى فايوة
Name[br]=Lugent an hezoug Sony Vaio
Name[bs]=Sony Vaio dodatak
@@ -10,6 +7,7 @@ Name[ca]=Connector Sony Vaio
Name[cs]=Sony Vaio modul
Name[cy]=Ategyn Sony Vaio
Name[da]=Sony Vaio plugin
+Name[de]=Zusatzmodul für Sony Vaio Notebooks
Name[el]=Πρόσθετο Sony Vaio
Name[es]=Extensión para Sony Vaio
Name[et]=Sony Vaio plugin
@@ -54,7 +52,8 @@ Name[uz@cyrillic]=Sony Vaio плагини
Name[wa]=Tchôke-divins Sony Vaio
Name[zh_CN]=索尼 Vaio 插件
Name[zh_TW]=Sony Vaio 外掛程式
-Comment=KMilo Module for Sony Vaio Laptop support
+
+Comment=Enables support for Sony Vaio laptops
Comment[ar]=وحدة KMilo لدعم حاسوب سونى فايو المحمول
Comment[bg]=Модул за поддръжка на KMilo за лаптопи Sony Vaio
Comment[bs]=KMilo modul za podršku za Sony Vaio laptope
@@ -62,7 +61,7 @@ Comment[ca]=Mòdul KMilo per funcionar amb portàtils Sony Vaio
Comment[cs]=KMilo modul pro podporu notebooků Sony Vaio
Comment[cy]=Cynhaliaeth Modiwl KMilo ar gyfer Gluniadur Sony Vaio
Comment[da]=KMilo Modul for understøttelse af Sony Vaio bærbare
-Comment[de]=KMilo-Modul für Sony Vaio Notebook-Unterstützung
+Comment[de]=Aktiviert die Unterstützung für Sony Vaio Notebooks
Comment[el]=Πρόσθετο KMilo για υποστήριξη του φορητού Sony Vaio
Comment[es]=Módulo KMilo para el soporte del portátil Sony Vaio
Comment[et]=KMilo moodul Sony Vaio sülearvuti toega
@@ -103,4 +102,9 @@ Comment[tr]=Sony Vaio Dizüstüler için KMilo Modül desteği
Comment[uk]=Модуль KMilo, що додає підтримку лептопів Sony Vaio
Comment[zh_CN]=索尼 Vaio 便携电脑支持的 KMilo 模块
Comment[zh_TW]=支援 Sony Vaio 筆記型電腦的 KMilo 模組
+
+Type=Service
+X-TDE-ServiceTypes=KMilo Plugin
+X-TDE-ModuleType=Plugin
+
X-TDE-Library=kmilo_kvaio
diff --git a/kmilo/kmilod/kmilod.desktop b/kmilo/kmilod/kmilod.desktop
index ab2a335..6107ecb 100644
--- a/kmilo/kmilod/kmilod.desktop
+++ b/kmilo/kmilod/kmilod.desktop
@@ -1,17 +1,6 @@
[Desktop Entry]
-Type=Service
-X-TDE-ServiceTypes=KDEDModule
-X-TDE-ModuleType=Library
-X-TDE-Library=kmilod
-X-TDE-FactoryName=kmilod
-X-TDE-Kded-autoload=true
-X-TDE-Kded-load-on-demand=false
Name=KMilo
-Name[de]=KMilo Sondertasten
-Name[hi]=के-मिलो
-Name[ne]=केमिलो
-Name[sv]=Kmilo
-Name[ta]= கேமிலோ
+
Comment=TDE special key notifier
Comment[ar]=مبلغ كدى للمفاتيح الخاصة
Comment[bg]=Известяване при натискане на специалните клавиши на някои модели лаптопи
@@ -57,3 +46,11 @@ Comment[tr]=TDE özel tuş bildirici
Comment[uk]=Сповіщувач про натискання спеціальних клавіш для TDE
Comment[zh_CN]=TDE 特殊按键通知程序
Comment[zh_TW]=TDE 特殊鍵通知
+
+Type=Service
+X-TDE-ServiceTypes=KDEDModule
+X-TDE-ModuleType=Library
+X-TDE-Library=kmilod
+X-TDE-FactoryName=kmilod
+X-TDE-Kded-autoload=true
+X-TDE-Kded-load-on-demand=false \ No newline at end of file
diff --git a/kmilo/powerbook/kmilo_powerbook.desktop b/kmilo/powerbook/kmilo_powerbook.desktop
index 51c8811..9adec46 100644
--- a/kmilo/powerbook/kmilo_powerbook.desktop
+++ b/kmilo/powerbook/kmilo_powerbook.desktop
@@ -1,105 +1,109 @@
[Desktop Entry]
-Type=Service
-X-TDE-ServiceTypes=KMilo Plugin
-X-TDE-ModuleType=Plugin
-Name=Apple (R) PowerBook (R) Plugin
-Name[ar]=ملحق Apple (R) PowerBook (R)ة
-Name[br]=Lugent Apple (R) PowerBook (R)
-Name[bs]=Apple (R) PowerBook (R) dodatak
-Name[ca]=Connector Apple (R) PowerBook (R)
-Name[cs]=Apple (R) PowerBook (R) modul
-Name[cy]=Ategyn Apple (R) PowerBook (R)
-Name[da]=Apple (R) PowerBook (R) plugin
-Name[el]=Πρόσθετο Apple (R) PowerBook (R)
-Name[es]=Extensión para Apple ® PowerBook ®
-Name[et]=Apple (R) PowerBook (R) plugin
-Name[eu]=Apple (R) PowerBook (R) Plugina
-Name[fa]=Apple (R) PowerBook (R) وصلۀ
-Name[fi]=Apple (R) PowerBook (R) -liitännäinen
-Name[fr]=Module externe Apple (R) PowerBook (R)
-Name[ga]=Breiseán Apple® PowerBook®
-Name[he]=תוסף למחשבי Apple (R) PowerBook (R)
-Name[hi]=एप्पल (R) पावरबुक (R) प्लगइन
-Name[hu]=Apple (R) PowerBook (R) bővítőmodul
-Name[is]=Apple (R) PowerBook (R) íforrit
-Name[it]=Plugin per Apple (R) PowerBook (R)
-Name[ja]=Apple (R) PowerBook (R) プラグイン
-Name[ka]=Apple (R) PowerBook (R) მოდული
-Name[kk]=Apple (R) PowerBook (R) модулі
-Name[km]=កម្មវិធី​ជំនួយ Apple (R) PowerBook (R)
-Name[lt]=Apple (R) PowerBook (R) priedas
-Name[mk]=Приклучок за Apple (R) PowerBook (R)
-Name[nb]=Programtillegg for Apple (R) PowerBook (R)
-Name[nds]=Apple(R) PowerBook(R)-Moduul
-Name[ne]=एप्पल (R) पावरबुक (R) प्लगइन
-Name[nl]=Apple (R) PowerBook (R)-Plugin
-Name[nn]=Tilleggsprogram for Apple ® PowerBook ®
-Name[pa]=Apple (R) PowerBook (R) ਪਲੱਗਿੰਨ
-Name[pl]=Wtyczka Apple (R) PowerBook (R)
-Name[pt]='Plugin' para Apple (R) PowerBook (R)
-Name[pt_BR]=Plug-in para Apple (R) PowerBook (R)
-Name[ro]=Modul Apple (R) PowerBook (R)
-Name[ru]=Модуль Apple® PowerBook®
-Name[sk]=Modul pre Apple (R) PowerBook (R)
-Name[sl]=Vstavek za Apple (R) PowerBook (R)
+Name=Apple PowerBook Plugin
+Name[ar]=ملحق Apple PowerBookة
+Name[br]=Lugent Apple PowerBook
+Name[bs]=Apple PowerBook dodatak
+Name[ca]=Connector Apple PowerBook
+Name[cs]=Apple PowerBook modul
+Name[cy]=Ategyn Apple PowerBook
+Name[da]=Apple PowerBook plugin
+Name[de]=Zusatzmodul für Apple PowerBooks
+Name[el]=Πρόσθετο Apple PowerBook
+Name[es]=Extensión para Apple PowerBook
+Name[et]=Apple PowerBook plugin
+Name[eu]=Apple PowerBook Plugina
+Name[fa]=Apple PowerBook وصلۀ
+Name[fi]=Apple PowerBook -liitännäinen
+Name[fr]=Module externe Apple PowerBook
+Name[ga]=Breiseán ApplePowerBook
+Name[he]=תוסף למחשבי Apple PowerBook
+Name[hi]=एप्पल पावरबुक प्लगइन
+Name[hu]=Apple PowerBook bővítőmodul
+Name[is]=Apple PowerBook íforrit
+Name[it]=Plugin per Apple PowerBook
+Name[ja]=Apple PowerBook プラグイン
+Name[ka]=Apple PowerBook მოდული
+Name[kk]=Apple PowerBook модулі
+Name[km]=កម្មវិធី​ជំនួយ Apple PowerBook
+Name[lt]=Apple PowerBook priedas
+Name[mk]=Приклучок за Apple PowerBook
+Name[nb]=Programtillegg for Apple PowerBook
+Name[nds]=ApplePowerBook(R)-Moduul
+Name[ne]=एप्पल पावरबुक प्लगइन
+Name[nl]=Apple PowerBook-Plugin
+Name[nn]=Tilleggsprogram for Apple PowerBook
+Name[pa]=Apple PowerBook ਪਲੱਗਿੰਨ
+Name[pl]=Wtyczka Apple PowerBook
+Name[pt]='Plugin' para Apple PowerBook
+Name[pt_BR]=Plug-in para Apple PowerBook
+Name[ro]=Modul Apple PowerBook
+Name[ru]=Модуль ApplePowerBook
+Name[sk]=Modul pre Apple PowerBook
+Name[sl]=Vstavek za Apple PowerBook
Name[sr]=Прикључак за Apple-ов PowerBook
Name[sr@Latn]=Priključak za Apple-ov PowerBook
-Name[sv]=Apple ® PowerBook ®-insticksprogram
-Name[ta]=ஆப்பிள் (R) பவர்புக் (R) சொருகுப்பொருள்
-Name[tg]=Модули Apple (R) PowerBook (R)
-Name[tr]=Apple (R) PowerBook (R) Eklentisi
-Name[uk]=Втулок Apple (R) PowerBook (R)
-Name[uz]=Apple (R) PowerBook (R) plagini
-Name[uz@cyrillic]=Apple (R) PowerBook (R) плагини
-Name[zh_CN]=Apple(R) PowerBook(R) 插件
-Name[zh_TW]=Apple (R) PowerBook (R) 外掛程式
-Comment=This plugin enables support for special keys on Apple (R) PowerBook (R) laptops via pbbuttonsd.
-Comment[ar]=تمكّن الدعم لمفاتيح حاسوب Apple (R) PowerBook (R) المحمول الخاصة عن طريق pbbuttonsd.
-Comment[bg]=Тази приставка позволява поддръжката на специалните клавиши на Apple (R) PowerBook (R) laptops.
-Comment[bs]=Ovaj dodatak (plugin) omogućuje podršku za posebne tipke na Apple (R) PowerBook (R) laptopima koristeći pbbuttonsd.
-Comment[ca]=Aquest connector activa el funcionament per a tecles especials dels Apple (R) PowerBooks (R) via pbbuttonsd.
-Comment[cs]=Tento modul umožňuje používat zvláštní klávesy notebooků Apple (R) PowerBook (R) přes pbbuttonsd.
-Comment[cy]=Galluoga'r ategyn yma gynhaliaeth ar gyfer bysyll arbennig ar luniaduron Apple (R) PowerBook (R) drwy pbbuttonsd.
-Comment[da]=Dette plugin aktivere støtte for specielle taster på Apple (R) PowerBook (R) bærbare via pbbuttonsd.
-Comment[de]=Dieses Plugin schaltet die Unterstützung für Sondertasten des Apple (R) Powerbooks (R) via pbbuttonsd ein.
-Comment[el]=Αυτό το πρόσθετο ενεργοποιεί την υποστήριξη για ειδικά πλήκτρα στα φορητά Apple (R) PowerBook (R) μέσω του pbbuttonsd.
-Comment[es]=Esta extensión activa el soporte de las teclas especiales en los portátiles Apple ® PowerBook ® mediante pbbuttonsd.
-Comment[et]=See plugin võimaldab pbbuttonsd vahendusel kasutada eriklahve Apple (R) PowerBook (R) sülearvutil.
-Comment[eu]=Plugin honek tekla berezientzako euskarria gaitzen du Apple (R) PowerBook (R) magalekoetan pbbuttonsd bitartez.
-Comment[fa]=این وصله، برای کلیدهای ویژۀ روی رایانه‌های کیفی Apple (R) PowerBook (R) via pbbuttonsd پشتیبانی را فعال می‌کند.
-Comment[fi]=Tänmä liitännäinen mahdollistaa tuen Apple (R) PowerBook (R) kannettavien erikoisnäppäimille pbbuttonsd-ohjelman kautta.
-Comment[fr]=Ce module active la gestion des touches spéciales des Apple (R)PowerBook (R) via pbbuttonsd.
-Comment[ga]=Tacaíonn an breiseán seo le cnaipí speisialta ar ríomhairí glúine Apple® PowerBook® trí pbbuttonsd.
-Comment[he]=התוסף הזה מאפשר תמיכה במקשים מיוחדים על מחשבים הברכיים של Apple (R) PowerBook (R)
-Comment[hi]=यह प्लगइन एपल (R) पावर-बुक (R) लैपटॉप पर pbbuttonsd के द्वारा विशिष्ट कुंजी समर्थन सक्षम करता है
-Comment[hu]=Ez a bővítőmodul lehetővé teszi az extra billentyűk használatát Apple (R) PowerBook (R) noteszgépeken (a pbbuttonsd szolgáltatáson keresztül).
-Comment[is]=Þetta íforrit gerir þér kleyft að nota sérhnappana á Apple (R) PowerBook (R) með pbbuttonsd þjóninum.
-Comment[it]=Questo plugin abilita il supporto per i tasti speciali sui portatili Apple (R) PowerBook (R) tramite pbbuttonsd.
-Comment[ja]=このプラグインは pbbuttonsd を通して Apple (R) PowerBook (R) ラップトップの特殊キーをサポートします
-Comment[ka]=.ეს მოდული რთავს Apple (R) PowerBook (R) ლეპტოპის სპეციალური კლავიშების მხარდაჭერას pbbuttonsd-ის მეშვეობით.
-Comment[kk]=Бұл модуль Apple (R) PowerBook (R) ноутбуктерінде pbbuttonsd арқылы арнаулы пернелерді қолдау үшін.
-Comment[km]=កម្មវិធី​ជំនួយនេះបើក​ការគាំទ្រ​សម្រាប់​គ្រាប់ចុច​ពិសេសនៅ​លើកុំព្យូទ័រ​យួរដៃ Apple (R) PowerBook (R) តាម​រយៈ pbbuttonsd ។
-Comment[lt]=Šis priedas įgalina specialiųjų raktų Apple (R) PowerBook (R) nešiojamuose kompiuteriuose palaikymą per pbbuttonsd.
-Comment[mk]=Овој приклучок дава поддршка за специјалните копчиња на лаптопите Apple (R) PowerBook (R) преку pbbuttonsd.
-Comment[nb]=Dette programtilleggmet muliggjør støtte for spesielle taster på Apple (R) PowerBook (R) bærbare maskiner via pbbuttonsd.
-Comment[nds]=Dit Moduul maakt de Sünnertasten-Ünnerstütten för PowerBook(R)-Klappreekners vun Apple(R) via pbbuttonsd an.
-Comment[ne]=यो प्लगइनले pbbuttonsd द्वारा एप्पल (R) पावरबुक (R) ल्यापटपका विशेष कुञ्जीका लागि समर्थन सक्षम पार्दछ ।
-Comment[nl]=Maakt het mogelijk speciale toetsen op Apple (R) PowerBook (R) laptops te gebruiken via pbbuttonsd.
-Comment[nn]=Dette programtillegget gjer at du kan bruka spesialtastane på Apple® PowerBook® gjennom pbbuttonsd.
-Comment[pl]=Ta wtyczka umożliwia obsługę klawiszy specjalnych na laptopach Apple (R) PowerBook (R) za pomocą pbbuttonsd.
-Comment[pt]=Este 'plugin' activa o suporte para as teclas especiais nos portáteis Apple (R) PowerBook (R) através do 'pbbuttonsd'.
-Comment[pt_BR]=Este plug-in habilita suporte para teclas especiais nos Apple (R) PowerBooks (R) via pbbuttonsd.
-Comment[ro]=Acest modul activează suportul pentru tastele speciale din laptop-urile Apple (R) PowerBook (R), utilizînd "pbbuttonsd".
-Comment[ru]=Этот модуль поддерживает специальные клавиши на ноутбуках Apple® PowerBook® через pbbuttonsd.
-Comment[sk]=Tento modul obsahuje podporu špeciálnych kláves pre Apple (R) PowerBook (R) pomocou pbbuttonsd.
-Comment[sl]=Ta vstavek vam omogoča podboro posebnim ključem na prenosnikih Apple (R) PowerBook (R) preko pbbuttonsd.
+Name[sv]=Apple PowerBook insticksprogram
+Name[ta]=ஆப்பிள் பவர்புக் சொருகுப்பொருள்
+Name[tg]=Модули Apple PowerBook
+Name[tr]=Apple PowerBook Eklentisi
+Name[uk]=Втулок Apple PowerBook
+Name[uz]=Apple PowerBook plagini
+Name[uz@cyrillic]=Apple PowerBook плагини
+Name[zh_CN]=ApplePowerBook插件
+Name[zh_TW]=Apple PowerBook 外掛程式
+
+Comment=Enables support for special keys on Apple PowerBook laptops via pbbuttonsd
+Comment[ar]=تمكّن الدعم لمفاتيح حاسوب Apple PowerBook المحمول الخاصة عن طريق pbbuttonsd.
+Comment[bg]=Тази приставка позволява поддръжката на специалните клавиши на Apple PowerBook laptops.
+Comment[bs]=Ovaj dodatak (plugin) omogućuje podršku za posebne tipke na Apple PowerBook laptopima koristeći pbbuttonsd.
+Comment[ca]=Aquest connector activa el funcionament per a tecles especials dels Apple PowerBooks via pbbuttonsd.
+Comment[cs]=Tento modul umožňuje používat zvláštní klávesy notebooků Apple PowerBook přes pbbuttonsd.
+Comment[cy]=Galluoga'r ategyn yma gynhaliaeth ar gyfer bysyll arbennig ar luniaduron Apple PowerBook drwy pbbuttonsd.
+Comment[da]=Dette plugin aktivere støtte for specielle taster på Apple PowerBook bærbare via pbbuttonsd.
+Comment[de]=Aktiviert die Unterstützung für Sondertasten bei Apple Powerbooks über pbbuttonsd
+Comment[el]=Αυτό το πρόσθετο ενεργοποιεί την υποστήριξη για ειδικά πλήκτρα στα φορητά Apple PowerBook μέσω του pbbuttonsd.
+Comment[es]=Esta extensión activa el soporte de las teclas especiales en los portátiles Apple PowerBook mediante pbbuttonsd.
+Comment[et]=See plugin võimaldab pbbuttonsd vahendusel kasutada eriklahve Apple PowerBook sülearvutil.
+Comment[eu]=Plugin honek tekla berezientzako euskarria gaitzen du Apple PowerBook magalekoetan pbbuttonsd bitartez.
+Comment[fa]=این وصله، برای کلیدهای ویژۀ روی رایانه‌های کیفی Apple PowerBook via pbbuttonsd پشتیبانی را فعال می‌کند.
+Comment[fi]=Tänmä liitännäinen mahdollistaa tuen Apple PowerBook kannettavien erikoisnäppäimille pbbuttonsd-ohjelman kautta.
+Comment[fr]=Ce module active la gestion des touches spéciales des ApplePowerBook via pbbuttonsd.
+Comment[ga]=Tacaíonn an breiseán seo le cnaipí speisialta ar ríomhairí glúine ApplePowerBooktrí pbbuttonsd.
+Comment[he]=התוסף הזה מאפשר תמיכה במקשים מיוחדים על מחשבים הברכיים של Apple PowerBook
+Comment[hi]=यह प्लगइन एपल पावर-बुक लैपटॉप पर pbbuttonsd के द्वारा विशिष्ट कुंजी समर्थन सक्षम करता है
+Comment[hu]=Ez a bővítőmodul lehetővé teszi az extra billentyűk használatát Apple PowerBook noteszgépeken (a pbbuttonsd szolgáltatáson keresztül).
+Comment[is]=Þetta íforrit gerir þér kleyft að nota sérhnappana á Apple PowerBook með pbbuttonsd þjóninum.
+Comment[it]=Questo plugin abilita il supporto per i tasti speciali sui portatili Apple PowerBook tramite pbbuttonsd.
+Comment[ja]=このプラグインは pbbuttonsd を通して Apple PowerBook ラップトップの特殊キーをサポートします
+Comment[ka]=.ეს მოდული რთავს Apple PowerBook ლეპტოპის სპეციალური კლავიშების მხარდაჭერას pbbuttonsd-ის მეშვეობით.
+Comment[kk]=Бұл модуль Apple PowerBook ноутбуктерінде pbbuttonsd арқылы арнаулы пернелерді қолдау үшін.
+Comment[km]=កម្មវិធី​ជំនួយនេះបើក​ការគាំទ្រ​សម្រាប់​គ្រាប់ចុច​ពិសេសនៅ​លើកុំព្យូទ័រ​យួរដៃ Apple PowerBook តាម​រយៈ pbbuttonsd ។
+Comment[lt]=Šis priedas įgalina specialiųjų raktų Apple PowerBook nešiojamuose kompiuteriuose palaikymą per pbbuttonsd.
+Comment[mk]=Овој приклучок дава поддршка за специјалните копчиња на лаптопите Apple PowerBook преку pbbuttonsd.
+Comment[nb]=Dette programtilleggmet muliggjør støtte for spesielle taster på Apple PowerBook bærbare maskiner via pbbuttonsd.
+Comment[nds]=Dit Moduul maakt de Sünnertasten-Ünnerstütten för PowerBook(R)-Klappreekners vun Applevia pbbuttonsd an.
+Comment[ne]=यो प्लगइनले pbbuttonsd द्वारा एप्पल पावरबुक ल्यापटपका विशेष कुञ्जीका लागि समर्थन सक्षम पार्दछ ।
+Comment[nl]=Maakt het mogelijk speciale toetsen op Apple PowerBook laptops te gebruiken via pbbuttonsd.
+Comment[nn]=Dette programtillegget gjer at du kan bruka spesialtastane på ApplePowerBookgjennom pbbuttonsd.
+Comment[pl]=Ta wtyczka umożliwia obsługę klawiszy specjalnych na laptopach Apple PowerBook za pomocą pbbuttonsd.
+Comment[pt]=Este 'plugin' activa o suporte para as teclas especiais nos portáteis Apple PowerBook através do 'pbbuttonsd'.
+Comment[pt_BR]=Este plug-in habilita suporte para teclas especiais nos Apple PowerBooks via pbbuttonsd.
+Comment[ro]=Acest modul activează suportul pentru tastele speciale din laptop-urile Apple PowerBook, utilizînd "pbbuttonsd".
+Comment[ru]=Этот модуль поддерживает специальные клавиши на ноутбуках ApplePowerBookчерез pbbuttonsd.
+Comment[sk]=Tento modul obsahuje podporu špeciálnych kláves pre Apple PowerBook pomocou pbbuttonsd.
+Comment[sl]=Ta vstavek vam omogoča podboro posebnim ključem na prenosnikih Apple PowerBook preko pbbuttonsd.
Comment[sr]=Овај прикључак омогућава подршку за специјалне тастере на Apple-овим PowerBook лаптопима преко pbbuttonsd.
Comment[sr@Latn]=Ovaj priključak omogućava podršku za specijalne tastere na Apple-ovim PowerBook laptopima preko pbbuttonsd.
-Comment[sv]=Det här insticksprogrammet aktiverar stöd för speciella tangenter för Apple ® PowerBook ® via pbbuttonsd.
-Comment[ta]=ஆப்பிள் (R) பவர்புக் (R) மடிக் கணினி மூலமாக பிபிபட்டன்எஸ்டி போன்றவைக்கு இந்த சொருகு பொருள் ஆதரிக்கிறது.
-Comment[tg]=Ин модул пуштибонии калидҳои махсусро дар компютери дастии Apple (R) PowerBook (R) ба воситаи pbbuttonsd дармегиронад.
-Comment[tr]=Bu plugin pbbuttonsd aracılığı ile Apple(R) PowerBook(R) dizüstüler için özel tuş desteğini açar.
-Comment[uk]=Цей втулок дозволяє користуватися спеціальними клавішами на лептопах Apple (R) PowerBook (R) за допомогою pbbuttonsd.
-Comment[zh_CN]=此插件启用 Apple(R) PowerBook(R) 便携电脑上的特殊按键。
-Comment[zh_TW]=這個外掛程式透過 pbbuttonsd 開啟 Apple(R) PowerBook(R) 筆記型電腦的特殊鍵支援。
+Comment[sv]=Det här insticksprogrammet aktiverar stöd för speciella tangenter för Apple PowerBook via pbbuttonsd.
+Comment[ta]=ஆப்பிள் பவர்புக் மடிக் கணினி மூலமாக பிபிபட்டன்எஸ்டி போன்றவைக்கு இந்த சொருகு பொருள் ஆதரிக்கிறது.
+Comment[tg]=Ин модул пуштибонии калидҳои махсусро дар компютери дастии Apple PowerBook ба воситаи pbbuttonsd дармегиронад.
+Comment[tr]=Bu plugin pbbuttonsd aracılığı ile ApplePowerBookdizüstüler için özel tuş desteğini açar.
+Comment[uk]=Цей втулок дозволяє користуватися спеціальними клавішами на лептопах Apple PowerBook за допомогою pbbuttonsd.
+Comment[zh_CN]=此插件启用 ApplePowerBook便携电脑上的特殊按键。
+Comment[zh_TW]=這個外掛程式透過 pbbuttonsd 開啟 ApplePowerBook筆記型電腦的特殊鍵支援。
+
+Type=Service
+X-TDE-ServiceTypes=KMilo Plugin
+X-TDE-ModuleType=Plugin
+
X-TDE-Library=kmilo_powerbook
diff --git a/kmilo/powerbook2/kmilo_powerbook.desktop b/kmilo/powerbook2/kmilo_powerbook.desktop
index 560d12a..fc75c16 100644
--- a/kmilo/powerbook2/kmilo_powerbook.desktop
+++ b/kmilo/powerbook2/kmilo_powerbook.desktop
@@ -1,7 +1,4 @@
[Desktop Entry]
-Type=Service
-X-TDE-ServiceTypes=KMilo Plugin
-X-TDE-ModuleType=Plugin
Name=Apple PowerBook Plugin
Name[ar]=ملحق Apple PowerBook
Name[br]=Lugent Apple PowerBook
@@ -9,6 +6,7 @@ Name[bs]=Apple PowerBook dodatak
Name[ca]=Connector Apple PowerBook
Name[cs]=Apple PowerBook modul
Name[cy]=Ategyn Apple PowerBook
+Name[de]=Zusatzmodul für Apple PowerBooks
Name[el]=Πρόσθετο Apple PowerBook
Name[es]=Extensión del PowerBook de Apple
Name[et]=Apple PowerBooki plugin
@@ -53,7 +51,8 @@ Name[uz]=Apple PowerBook plagini
Name[uz@cyrillic]=Apple PowerBook плагини
Name[zh_CN]=Apple PowerBook 插件
Name[zh_TW]=Apple Powerbook 外掛程式
-Comment=This plugin enabled support for special keys on Apple PowerBooks via pbbuttonsd.
+
+Comment=Enabled support for special keys on Apple PowerBooks via pbbuttonsd
Comment[ar]=تمكّن الدعم لمفاتيح حاسوب Apple PowerBook المحمول الخاصة عن طريق pbbuttonsd.
Comment[bg]=Тази приставка позволява поддръжката на специалните клавиши на Apple PowerBooks.
Comment[bs]=Ovaj dodatak (plugin) omogućuje podršku za posebne tipke na Apple PowerBooks laptopima koristeći pbbuttonsd.
@@ -61,7 +60,7 @@ Comment[ca]=Aquest connector activa el funcionament per a tecles especials dels
Comment[cs]=Tento modul umožňuje používat zvláštní klávesy notebooků Apple PowerBook přes pbbuttonsd.
Comment[cy]=Galluoga'r ategyn yma gynhaliaeth ar gyfer bysyll arbennig ar yr Apple PowerBook drwy pbbuttonsd.
Comment[da]=Dette plugin aktivere støtte for specielle taster på Apple PowerBooks via pbbuttonsd.
-Comment[de]=Dieses Plugin schaltet die Unterstützung für Sondertasten des Apple Powerbooks via pbbuttonsd ein.
+Comment[de]=Aktiviert die Unterstützung für Sondertasten bei Apple Powerbooks über pbbuttonsd
Comment[el]=Αυτό το πρόσθετο ενεργοποιεί την υποστήριξη για ειδικά πλήκτρα στα Apple PowerBooks μέσω του pbbuttonsd.
Comment[es]=Esta extensión activa el soporte de las teclas especiales en los PowerBooks de Apple mediante «pbbuttonsd».
Comment[et]=See plugin võimaldab pbbuttonsd vahendusel kasutada eriklahve Apple PowerBooksil
@@ -103,4 +102,9 @@ Comment[tr]=Bu plugin pbbuttonsd aracılığı ile Apple PowerBook dizüstüler
Comment[uk]=Цей втулок дозволив користуватися спеціальними клавішами на лептопах Apple PowerBook за допомогою pbbuttonsd.
Comment[zh_CN]=此插件启用 Apple PowerBook 电源按钮的特殊按键支持。
Comment[zh_TW]=這個外掛程式透過 pbbuttonsd 開啟 Apple Powerbooks 特殊鍵支援。
+
+Type=Service
+X-TDE-ServiceTypes=KMilo Plugin
+X-TDE-ModuleType=Plugin
+
X-TDE-Library=kmilo_powerbook
diff --git a/kmilo/thinkpad/kmilo_thinkpad.desktop b/kmilo/thinkpad/kmilo_thinkpad.desktop
index ad5642d..699c00c 100644
--- a/kmilo/thinkpad/kmilo_thinkpad.desktop
+++ b/kmilo/thinkpad/kmilo_thinkpad.desktop
@@ -1,7 +1,4 @@
[Desktop Entry]
-Type=Service
-X-TDE-ServiceTypes=KMilo Plugin
-X-TDE-ModuleType=Plugin
Name=Thinkpad Plugin
Name[ar]=ملحق Thinkpad
Name[br]=Lugent Thinkpad
@@ -9,7 +6,7 @@ Name[bs]=Thinkpad dodatak
Name[ca]=Connector Thinkpad
Name[cs]=Thinkpad modul
Name[cy]=Ategyn Thinkpad
-Name[de]=Thinkpad-Plugin
+Name[de]=Zusatzmodul für Thinkpads
Name[el]=Πρόσθετο Thinkpad
Name[eo]=Thinkpad-kromaĵo
Name[es]=Extensión para Thinkpad
@@ -51,6 +48,7 @@ Name[uz]=Thinkpad plagini
Name[uz@cyrillic]=Thinkpad плагини
Name[zh_CN]=Thinkpad 插件
Name[zh_TW]=Thinkpad 外掛程式
+
Comment=Enables support for special Thinkpad keys
Comment[ar]=تمكّن الدعم لمفاتيح Thinkpad الخاصة
Comment[bg]=Тази приставка позволява поддръжката на специалните клавиши на IBM Thinkpad
@@ -59,7 +57,7 @@ Comment[ca]=Habilita el funcionament per a tecles especials de Thinkpad
Comment[cs]=Umožňuje podporu speciálních kláves Thinkpadu
Comment[cy]=Yn galluogi cynhaliaeth ar gyfer bysyll arbennig Thinkpad
Comment[da]=Aktiverer støtte for specielle Thinkpad taster
-Comment[de]=Dieses Plugin aktiviert die Unterstützung für Sondertasten von Thinkpad-Tastaturen
+Comment[de]=Aktiviert die Unterstützung für Sondertasten bei Thinkpads
Comment[el]=Ενεργοποιεί την υποστήριξη για ειδικά πλήκτρα του Thinkpad
Comment[es]=Activa el soporte de las teclas especiales del Thinkpad
Comment[et]=See plugin võimaldab kasutada Thinkpadi eriklahve.
@@ -98,4 +96,9 @@ Comment[tr]=Özel Thinkpad tuşları için desteği etkinleştirir
Comment[uk]=Уможливлює підтримку спеціальних клавіш для Thinkpad.
Comment[zh_CN]=此插件启用各种键盘和便携电脑的特殊按键
Comment[zh_TW]=開啟特殊 Thinkpad 按鍵支援
+
+Type=Service
+X-TDE-ServiceTypes=KMilo Plugin
+X-TDE-ModuleType=Plugin
+
X-TDE-Library=kmilo_thinkpad
diff --git a/kregexpeditor/gen_qregexplexer.cpp b/kregexpeditor/gen_qregexplexer.cpp
index b5ca999..b943814 100644
--- a/kregexpeditor/gen_qregexplexer.cpp
+++ b/kregexpeditor/gen_qregexplexer.cpp
@@ -606,9 +606,9 @@ YY_MALLOC_DECL
YY_DECL
{
- register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
- register int yy_act;
+ yy_state_type yy_current_state;
+ char *yy_cp, *yy_bp;
+ int yy_act;
#line 38 "qregexpparser.l"
@@ -654,7 +654,7 @@ YY_DECL
yy_match:
do
{
- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
if ( yy_accept[yy_current_state] )
{
yy_last_accepting_state = yy_current_state;
@@ -1029,9 +1029,9 @@ case YY_STATE_EOF(INITIAL):
static int yy_get_next_buffer()
{
- register char *dest = yy_current_buffer->yy_ch_buf;
- register char *source = yytext_ptr;
- register int number_to_move, i;
+ char *dest = yy_current_buffer->yy_ch_buf;
+ char *source = yytext_ptr;
+ int number_to_move, i;
int ret_val;
if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
@@ -1161,14 +1161,14 @@ static int yy_get_next_buffer()
static yy_state_type yy_get_previous_state()
{
- register yy_state_type yy_current_state;
- register char *yy_cp;
+ yy_state_type yy_current_state;
+ char *yy_cp;
yy_current_state = yy_start;
for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
{
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
if ( yy_accept[yy_current_state] )
{
yy_last_accepting_state = yy_current_state;
@@ -1200,10 +1200,10 @@ static yy_state_type yy_try_NUL_trans( yy_current_state )
yy_state_type yy_current_state;
#endif
{
- register int yy_is_jam;
- register char *yy_cp = yy_c_buf_p;
+ int yy_is_jam;
+ char *yy_cp = yy_c_buf_p;
- register YY_CHAR yy_c = 1;
+ YY_CHAR yy_c = 1;
if ( yy_accept[yy_current_state] )
{
yy_last_accepting_state = yy_current_state;
@@ -1224,14 +1224,14 @@ yy_state_type yy_current_state;
#ifndef YY_NO_UNPUT
#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
+static void yyunput( int c, char *yy_bp )
#else
static void yyunput( c, yy_bp )
int c;
-register char *yy_bp;
+char *yy_bp;
#endif
{
- register char *yy_cp = yy_c_buf_p;
+ char *yy_cp = yy_c_buf_p;
/* undo effects of setting up yytext */
*yy_cp = yy_hold_char;
@@ -1239,10 +1239,10 @@ register char *yy_bp;
if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
{ /* need to shift things up to make room */
/* +2 for EOB chars. */
- register int number_to_move = yy_n_chars + 2;
- register char *dest = &yy_current_buffer->yy_ch_buf[
+ int number_to_move = yy_n_chars + 2;
+ char *dest = &yy_current_buffer->yy_ch_buf[
yy_current_buffer->yy_buf_size + 2];
- register char *source =
+ char *source =
&yy_current_buffer->yy_ch_buf[number_to_move];
while ( source > yy_current_buffer->yy_ch_buf )
@@ -1703,7 +1703,7 @@ yyconst char *s2;
int n;
#endif
{
- register int i;
+ int i;
for ( i = 0; i < n; ++i )
s1[i] = s2[i];
}
@@ -1717,7 +1717,7 @@ static int yy_flex_strlen( s )
yyconst char *s;
#endif
{
- register int n;
+ int n;
for ( n = 0; s[n]; ++n )
;
diff --git a/kregexpeditor/gen_qregexpparser.cc b/kregexpeditor/gen_qregexpparser.cc
index 377f549..4fdefbc 100644
--- a/kregexpeditor/gen_qregexpparser.cc
+++ b/kregexpeditor/gen_qregexpparser.cc
@@ -240,7 +240,7 @@ union yyalloc
# define YYCOPY(To, From, Count) \
do \
{ \
- register YYSIZE_T yyi; \
+ YYSIZE_T yyi; \
for (yyi = 0; yyi < (Count); yyi++) \
(To)[yyi] = (From)[yyi]; \
} \
@@ -594,7 +594,7 @@ yystrlen (yystr)
const char *yystr;
# endif
{
- register const char *yys = yystr;
+ const char *yys = yystr;
while (*yys++ != '\0')
continue;
@@ -619,8 +619,8 @@ yystpcpy (yydest, yysrc)
const char *yysrc;
# endif
{
- register char *yyd = yydest;
- register const char *yys = yysrc;
+ char *yyd = yydest;
+ const char *yys = yysrc;
while ((*yyd++ = *yys++) != '\0')
continue;
@@ -741,8 +741,8 @@ yyparse (YYPARSE_PARAM_ARG)
YYPARSE_PARAM_DECL
{
- register int yystate;
- register int yyn;
+ int yystate;
+ int yyn;
int yyresult;
/* Number of tokens to shift before error messages enabled. */
int yyerrstatus;
@@ -760,12 +760,12 @@ yyparse (YYPARSE_PARAM_ARG)
/* The state stack. */
short yyssa[YYINITDEPTH];
short *yyss = yyssa;
- register short *yyssp;
+ short *yyssp;
/* The semantic value stack. */
YYSTYPE yyvsa[YYINITDEPTH];
YYSTYPE *yyvs = yyvsa;
- register YYSTYPE *yyvsp;
+ YYSTYPE *yyvsp;
diff --git a/kregexpeditor/kregexpeditor.desktop b/kregexpeditor/kregexpeditor.desktop
index a4c1d4a..7b2cd18 100644
--- a/kregexpeditor/kregexpeditor.desktop
+++ b/kregexpeditor/kregexpeditor.desktop
@@ -1,18 +1,7 @@
[Desktop Entry]
Name=KRegExpEditor
-Name[cs]=Editor regulárních výrazů
-Name[et]=Regulaaravaldiste redaktor
-Name[fa]=KRegExp ویرایشگر
-Name[hi]=के-रेग-एक्सप-एडीटर
-Name[pa]=KRegExp ਸੰਪਾਦਕ
-Name[pl]=Edytor wyrażeń regularnych
-Name[sv]=Kregexpeditor
-Name[ta]= KRegExp தொகுப்பி
-Name[tg]=KМуҳаррири Ифодаҳои Муқаррарӣ
-Name[wa]=Aspougneu d' erîlêyès ratourneures
-Name[zh_TW]=正規表示式編輯器
-Exec=kregexpeditor
-X-DocPath=KRegExpEditor/index.html
+Name[hi]=केरेगएक्सपएडीटर
+
GenericName=Regular Expression Editor
GenericName[ar]=محرّر التعابير النظامية
GenericName[bg]=Редактор на регулярни изрази
@@ -69,6 +58,10 @@ GenericName[uz@cyrillic]=Доимий ифода таҳрирчи
GenericName[wa]=Aspougneu d' erîlêyès ratourneures
GenericName[zh_CN]=正规表达式编辑器
GenericName[zh_TW]=正規表示式編輯器
+
+Exec=kregexpeditor
+X-DocPath=KRegExpEditor/index.html
+
Terminal=false
Type=Application
X-TDE-StartupNotify=true
diff --git a/ksim/ksim.desktop b/ksim/ksim.desktop
index d9ecbbf..4b3fdb3 100644
--- a/ksim/ksim.desktop
+++ b/ksim/ksim.desktop
@@ -1,4 +1,7 @@
[Desktop Entry]
+Name=KSim
+Name[hi]=केसिम
+
GenericName=System Monitor
GenericName[af]=Stelsel Monitor
GenericName[ar]=مراقب النظام
@@ -70,6 +73,7 @@ GenericName[xh]=Umphendli Wendlela Esetyenziswayo
GenericName[zh_CN]=系统监视器
GenericName[zh_TW]=系統監視器
GenericName[zu]=Umlawuli Wesistimu
+
Comment=System Information Monitor (GKrellM style)
Comment[ar]=مراقب معلومات نظام K (أسلوب GKrellM)
Comment[bg]=Информация за състоянието на системата (стил GKrellM)
@@ -77,7 +81,7 @@ Comment[bs]=Nadzor sistemskih informacija (nalik na GKrellM)
Comment[ca]=Monitor d'informació del sistema (similar a GKrellM)
Comment[cs]=Monitor systémových informací (ve stulu programu GKrellM)
Comment[da]=Systeminformationsovervågning (GKrellM-lignende)
-Comment[de]=System-Informationsüberwachung (GKrellM-Stil)
+Comment[de]=Systeminformationsüberwachung (GKrellM-Stil)
Comment[el]=Επόπτης πληροφοριών συστήματος (στο στυλ του GKrellM)
Comment[eo]=Monitoro por Sisteminformoj (GKrellM-stilo)
Comment[es]=Monitor de información del sistema (estilo GKrellM)
@@ -115,19 +119,10 @@ Comment[tr]=Sistem Bildirimileri İzleyici (GKrellM stili)
Comment[uk]=Монітор системної інформації (в стилі GKrellM)
Comment[zh_CN]=系统信息监视器(GKrellM 风格)
Comment[zh_TW]=系統資訊監視器 (GKrellM 風格)
+
X-DocPath=ksim/index.html
Icon=ksim
-MimeType=
-Name=KSim
-Name[af]=Ksim
-Name[cy]=kSim
-Name[eo]=Simulilo
-Name[hi]=के-सिम
-Name[ne]=केडीई सिम
-Name[sv]=Ksim
-Name[ta]=கேசிம்
-Name[th]=สอดส่องระบบ
-Name[zh_TW]=KSim 系統監視器
+
X-TDE-Library=ksim_panelextension
X-TDE-UniqueApplet=true
Categories=Qt;TDE;System;
diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp
index 1c1efbd..746c810 100644
--- a/ksim/ksimpref.cpp
+++ b/ksim/ksimpref.cpp
@@ -84,7 +84,7 @@ KSim::ConfigDialog::ConfigDialog(KSim::Config *config,
list << ' ' + i18n("Miscellaneous") << ' ' + i18n("Swap");
TQFrame *swap = addHBoxPage(list, i18n("Swap Options"),
- SmallIcon("drive-harddisk"));
+ SmallIcon("drive-harddisk-unmounted"));
m_swapPage = new KSim::SwapPrefs(swap);
TQFrame *theme = addHBoxPage(' ' + i18n("Themes"),
diff --git a/ksim/monitors/filesystem/DFree.desktop b/ksim/monitors/filesystem/DFree.desktop
index d6f23b1..3b7cb9e 100644
--- a/ksim/monitors/filesystem/DFree.desktop
+++ b/ksim/monitors/filesystem/DFree.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=drive-harddisk
+Icon=drive-harddisk-mounted
Name=DFree
Name[af]=Dfree
Name[bg]=Дялове
diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp
index 1435195..2fb77e1 100644
--- a/ksim/monitors/filesystem/filesystemwidget.cpp
+++ b/ksim/monitors/filesystem/filesystemwidget.cpp
@@ -217,7 +217,7 @@ void FilesystemWidget::showMenu(uint id)
TQPopupMenu menu;
menu.insertItem(SmallIcon("drive-harddisk-mounted"), i18n("&Mount Device"), 1);
- menu.insertItem(SmallIcon("drive-harddisk"), i18n("&Unmount Device"), 2);
+ menu.insertItem(SmallIcon("drive-harddisk-unmounted"), i18n("&Unmount Device"), 2);
switch (menu.exec(TQCursor::pos())) {
case 1:
diff --git a/ktimer/ktimer.desktop b/ktimer/ktimer.desktop
index 1fdab9d..9ce41ef 100644
--- a/ktimer/ktimer.desktop
+++ b/ktimer/ktimer.desktop
@@ -1,4 +1,7 @@
[Desktop Entry]
+Name=KTimer
+Name[hi]=केटाइमर
+
GenericName=Countdown Launcher
GenericName[ar]=بادئ العدّ التنازلى
GenericName[bg]=Хронометър
@@ -6,7 +9,7 @@ GenericName[ca]=Llançador amb compte enrere
GenericName[cs]=Stopky
GenericName[cy]=Cychwynydd Cyfrif yn Ôl
GenericName[da]=Nedtællingsstarter
-GenericName[de]=Startet den Zähler
+GenericName[de]=Digitale Zeitschaltuhr
GenericName[el]=Αντίστροφη μέτρηση για την ενεργοποίηση λογισμικού
GenericName[es]=Lanzador de cuenta atrás
GenericName[et]=Ajaarvestuse käivitaja
@@ -40,24 +43,12 @@ GenericName[tr]=Gerisayım Çalıştırıcı
GenericName[uk]=Таймер
GenericName[zh_CN]=倒计时
GenericName[zh_TW]=倒數發射計時
+
Exec=ktimer
Icon=ktimer
Type=Application
Terminal=false
-Name=KTimer
-Name[af]=Ktimer
-Name[eo]=Tempoplanilo
-Name[hi]=के-टाइमर
-Name[lv]=KTaimers
-Name[ne]=केडीई समय सूचक
-Name[pl]=Czasomierz
-Name[sv]=Ktimer
-Name[ta]= Kநேரம் காட்டி
-Name[tg]=KВақтсанҷ
-Name[th]=ตั้งเวลาทำงาน
-Name[ven]=Ratshikhathi wa K
-Name[xh]=Umjongi Wexesha
-Name[zh_TW]=TDE 計時器
+
X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
Categories=Qt;TDE;Utility;
diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp
index ec9e686..9ea8503 100644
--- a/superkaramba/src/main.cpp
+++ b/superkaramba/src/main.cpp
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
TDEAboutData about("superkaramba", I18N_NOOP("SuperKaramba"),
version, description,
TDEAboutData::License_GPL,
- "(c) 2003-2006 The SuperKaramba developers");
+ I18N_NOOP("(c) 2003-2006 The SuperKaramba developers"));
about.addAuthor("Adam Geitgey", 0, "adam@rootnode.org");
about.addAuthor("Hans Karlsson", 0, "karlsson.h@home.se");
about.addAuthor("Ryan Nickell", 0, "p0z3r@earthlink.net");
diff --git a/superkaramba/src/superkaramba.desktop b/superkaramba/src/superkaramba.desktop
index ef49f25..0e984a1 100644
--- a/superkaramba/src/superkaramba.desktop
+++ b/superkaramba/src/superkaramba.desktop
@@ -1,54 +1,7 @@
[Desktop Entry]
Name=SuperKaramba
-Name[ar]=سوبركارامبا
-Name[is]=SúperKaramba
Name[ne]=सुपरकराम्बा
-Name[sr]=СуперКарамба
-Exec=superkaramba %U
-Icon=superkaramba
-Type=Application
-MimeType=application/x-superkaramba;
-Comment=An engine for cool desktop eyecandy.
-Comment[ar]=محرك لجماليات سطح مكتب لطيفة.
-Comment[bg]=Модул за разкрасяване на работния плот
-Comment[bs]=Pogon za cool ukrase desktopa.
-Comment[ca]=Un motor per fer més vistós l'escriptori.
-Comment[cs]=Nástroj pro úžasnou pracovní plochu, která je pastvou pro oči.
-Comment[da]=En grænseflade for lækre øjegodter på desktoppen.
-Comment[de]=Infrastruktur für faszinierende optische Effekte
-Comment[el]=Μία μηχανή για εντυπωσιακές διακοσμήσεις επιφάνειας εργασίας.
-Comment[es]=Un motor para añadir vistosidad al escritorio.
-Comment[et]=Töölaua lahedate vidinate mootor.
-Comment[eu]=Mahaigaineko efektu politentzako euskarri bat.
-Comment[fa]=eyecandy موتوری برای سرد کردن رومیزی.
-Comment[fi]=Työpöydän hieno koristelu.
-Comment[fr]=Un moteur de bureau esthétique et sympathique
-Comment[he]=מנוע שהופך את שולחן העבודה למגניב.
-Comment[hu]=Keretrendszer grafikus asztali elemek használatához.
-Comment[is]=Flottar skjáborðsviðbætur.
-Comment[it]=Un motore per rendere il desktop più gradevole.
-Comment[ja]=格好いいデスクトップ eyecandy エンジン。
-Comment[kk]=Үстелдің әсем бөлшектері.
-Comment[km]=ម៉ាស៊ីន​សម្រាប់​កម្មវិធី​ត្រជាក់​ភ្នែក​របស់​ផ្ទៃតុ
-Comment[lt]=Šaunių darbastalio papuošimų priedas.
-Comment[nb]=Et program for kule skrivebordseffekter.
-Comment[nds]=En Ümgeven för wunnerbore Schriefdischeffekten.
-Comment[ne]=ठन्डा डेस्कटप आइक्यान्डीका लागि इन्जिन ।
-Comment[nl]=Een programma voor bureaubladverfraaiing.
-Comment[nn]=Eit rammeverk for lekre skrivebord.
-Comment[pl]=Narzędzie do tworzenia efektownego pulpitu.
-Comment[pt]=Um motor para embelezar o ecrã.
-Comment[pt_BR]=Mecanismo para recursos gráficos interessantes.
-Comment[ru]=Набор виджетов рабочего стола.
-Comment[sk]=Podpora pre cool desktop eyecandy.
-Comment[sl]=Pogon za lišpanje namizja.
-Comment[sr]=Машина за лицкање радне површине.
-Comment[sr@Latn]=Mašina za lickanje radne površine.
-Comment[sv]=Ett gränssnitt för häftigt ögongodis på skrivbordet.
-Comment[tr]=Masaüstünde güzel görünüm sağlayan bir motor.
-Comment[uk]=Рушій для елементів стільниці.
-Comment[zh_CN]=桌面养眼引擎。
-Comment[zh_TW]=桌面佈景選擇程式
+
GenericName=Desktop Widgets
GenericName[ar]=أدوات سطح المكتب
GenericName[bg]=Графични контроли
@@ -56,7 +9,7 @@ GenericName[bs]=Desktop ukrasi
GenericName[ca]=Estris de l'escriptori
GenericName[cs]=Udělátka pro pracovní plochu
GenericName[da]=Desktopkontroller
-GenericName[de]=Arbeitsflächen-Erweiterungen
+GenericName[de]=Erweiterungen für die Arbeitsfläche
GenericName[el]=Γραφικά συστατικά επιφάνειας εργασίας
GenericName[eo]=Tabulaj fenestraĵoj
GenericName[es]=Elementos visuales para el escritorio
@@ -94,6 +47,54 @@ GenericName[tr]=Masaüstü Ögeleri
GenericName[uk]=Віджети стільниці
GenericName[zh_CN]=桌面部件
GenericName[zh_TW]=桌面元件
+
+Comment=An engine for cool desktop eyecandy
+Comment[ar]=محرك لجماليات سطح مكتب لطيفة.
+Comment[bg]=Модул за разкрасяване на работния плот
+Comment[bs]=Pogon za cool ukrase desktopa.
+Comment[ca]=Un motor per fer més vistós l'escriptori.
+Comment[cs]=Nástroj pro úžasnou pracovní plochu, která je pastvou pro oči.
+Comment[da]=En grænseflade for lækre øjegodter på desktoppen.
+Comment[de]=Infrastruktur für faszinierende Erweiterungen der Arbeitsfläche
+Comment[el]=Μία μηχανή για εντυπωσιακές διακοσμήσεις επιφάνειας εργασίας.
+Comment[es]=Un motor para añadir vistosidad al escritorio.
+Comment[et]=Töölaua lahedate vidinate mootor.
+Comment[eu]=Mahaigaineko efektu politentzako euskarri bat.
+Comment[fa]=eyecandy موتوری برای سرد کردن رومیزی.
+Comment[fi]=Työpöydän hieno koristelu.
+Comment[fr]=Un moteur de bureau esthétique et sympathique
+Comment[he]=מנוע שהופך את שולחן העבודה למגניב.
+Comment[hu]=Keretrendszer grafikus asztali elemek használatához.
+Comment[is]=Flottar skjáborðsviðbætur.
+Comment[it]=Un motore per rendere il desktop più gradevole.
+Comment[ja]=格好いいデスクトップ eyecandy エンジン。
+Comment[kk]=Үстелдің әсем бөлшектері.
+Comment[km]=ម៉ាស៊ីន​សម្រាប់​កម្មវិធី​ត្រជាក់​ភ្នែក​របស់​ផ្ទៃតុ
+Comment[lt]=Šaunių darbastalio papuošimų priedas.
+Comment[nb]=Et program for kule skrivebordseffekter.
+Comment[nds]=En Ümgeven för wunnerbore Schriefdischeffekten.
+Comment[ne]=ठन्डा डेस्कटप आइक्यान्डीका लागि इन्जिन ।
+Comment[nl]=Een programma voor bureaubladverfraaiing.
+Comment[nn]=Eit rammeverk for lekre skrivebord.
+Comment[pl]=Narzędzie do tworzenia efektownego pulpitu.
+Comment[pt]=Um motor para embelezar o ecrã.
+Comment[pt_BR]=Mecanismo para recursos gráficos interessantes.
+Comment[ru]=Набор виджетов рабочего стола.
+Comment[sk]=Podpora pre cool desktop eyecandy.
+Comment[sl]=Pogon za lišpanje namizja.
+Comment[sr]=Машина за лицкање радне површине.
+Comment[sr@Latn]=Mašina za lickanje radne površine.
+Comment[sv]=Ett gränssnitt för häftigt ögongodis på skrivbordet.
+Comment[tr]=Masaüstünde güzel görünüm sağlayan bir motor.
+Comment[uk]=Рушій для елементів стільниці.
+Comment[zh_CN]=桌面养眼引擎。
+Comment[zh_TW]=桌面佈景選擇程式
+
+Exec=superkaramba %U
+Icon=superkaramba
+Type=Application
+MimeType=application/x-superkaramba;
+
X-DocPath=superkaramba/index.html
Categories=Qt;TDE;Utility;X-TDE-Utilities-Desktop;
OnlyShowIn=TDE;
diff --git a/superkaramba/src/superkaramba.lsm b/superkaramba/src/superkaramba.lsm
deleted file mode 100644
index a033f94..0000000
--- a/superkaramba/src/superkaramba.lsm
+++ /dev/null
@@ -1,14 +0,0 @@
-Begin4
-Title: SuperKaramba
-Version: R14.1.0
-Entered-date: 2010-05-10
-Description: Eye-candy for the Trinity Desktop Environment
-Keywords: TDE Qt
-Author: Hans Karlsson <karlsson.h@home.se>
-Maintained-by: The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
-Primary-site: http://git.trinitydesktop.org/cgit/
-Alternate-site:
-Original-site: http://netdragon.sourceforge.net/ssuperkaramba.html
-Platforms: Linux and other Unices running TDE
-Copying-policy: GPL
-End
diff --git a/tdefilereplace/configurationclasses.cpp b/tdefilereplace/configurationclasses.cpp
index afc3d85..964226b 100644
--- a/tdefilereplace/configurationclasses.cpp
+++ b/tdefilereplace/configurationclasses.cpp
@@ -83,8 +83,6 @@ RCOptions& RCOptions::operator=(const RCOptions& ci)
m_quickSearchString = ci.m_quickSearchString;
m_quickReplaceString = ci.m_quickReplaceString;
- m_recentStringFileList = ci.m_recentStringFileList;
-
m_notifyOnErrors = ci.m_notifyOnErrors;
return (*this);
diff --git a/tdefilereplace/configurationclasses.h b/tdefilereplace/configurationclasses.h
index beaa275..41b0ba9 100644
--- a/tdefilereplace/configurationclasses.h
+++ b/tdefilereplace/configurationclasses.h
@@ -30,7 +30,6 @@ const TQString rcSearchStringsList = "Search strings list";
const TQString rcReplaceStringsList = "Replace strings list";
const TQString rcDirectoriesList = "Directories list";
const TQString rcFiltersList = "Filters list";
-const TQString rcRecentFiles = "Recent files";
const TQString rcAllStringsMustBeFound = "All strings must be found";
const TQString rcEncoding = "Encoding";
const TQString rcCaseSensitive = "Case sensitive";
@@ -138,8 +137,6 @@ class RCOptions
TQString m_quickSearchString,
m_quickReplaceString;
- TQStringList m_recentStringFileList;
-
bool m_notifyOnErrors;
public:
diff --git a/tdefilereplace/kaddstringdlg.cpp b/tdefilereplace/kaddstringdlg.cpp
index 0e3c5f0..ba76c8c 100644
--- a/tdefilereplace/kaddstringdlg.cpp
+++ b/tdefilereplace/kaddstringdlg.cpp
@@ -2,7 +2,7 @@
KAddStringDlg.cpp - description
-------------------
begin : Sat Oct 16 1999
- copyright : (C) 1999 by Fran�ois Dupoux
+ copyright : (C) 1999 by François Dupoux
(C) 2004 Emiliano Gulmini <emi_barbarossa@yahoo.it>
email : dupoux@dupoux.com
***************************************************************************/
@@ -37,10 +37,9 @@
using namespace whatthisNameSpace;
-KAddStringDlg::KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *parent, const char *name) : KAddStringDlgS(parent,name,true)
+KAddStringDlg::KAddStringDlg(RCOptions* info, TQWidget *parent, const char *name) : KAddStringDlgS(parent,name,true)
{
m_option = info;
- m_wantEdit = wantEdit;
m_currentMap = m_option->m_mapStringsView;
initGUI();
@@ -64,53 +63,33 @@ void KAddStringDlg::initGUI()
m_stack->addWidget(m_stringView);
m_stack->addWidget(m_stringView_2);
+ if (m_option->m_searchingOnlyMode)
+ {
+ m_rbSearchOnly->setChecked(true);
+ }
+ else
+ {
+ m_rbSearchReplace->setChecked(true);
+ }
if(m_option->m_searchingOnlyMode)
{
- if(m_wantEdit)
- m_rbSearchReplace->setEnabled(false);
- m_rbSearchOnly->setChecked(true);
- m_edSearch->setEnabled(true);
m_edReplace->setEnabled(false);
- m_tlSearch->setEnabled(true);
m_tlReplace->setEnabled(false);
}
else
{
- if(m_wantEdit)
- m_rbSearchOnly->setEnabled(false);
- m_rbSearchReplace->setChecked(true);
- m_edSearch->setEnabled(true);
m_edReplace->setEnabled(true);
- m_tlSearch->setEnabled(true);
m_tlReplace->setEnabled(true);
}
raiseView();
-
- if(m_wantEdit)
- loadMapIntoView();
-}
-
-void KAddStringDlg::eraseViewItems()
-{
- TQListViewItem* item = m_sv->firstChild();
- if(item == 0)
- return;
- else
- {
- while(item)
- {
- TQListViewItem* tempItem = item;
- item = item->nextSibling();
- delete tempItem;
- }
- }
+ loadMapIntoView();
}
void KAddStringDlg::raiseView()
{
- if(m_option->m_searchingOnlyMode)
+ if (m_option->m_searchingOnlyMode)
m_sv = m_stringView_2;
else
m_sv = m_stringView;
@@ -175,38 +154,37 @@ void KAddStringDlg::slotOK()
void KAddStringDlg::slotSearchOnly()
{
m_option->m_searchingOnlyMode = true;
+ m_currentMap.clear();
m_rbSearchOnly->setChecked(true);
- m_edSearch->setEnabled(true);
m_edReplace->setEnabled(false);
- m_tlSearch->setEnabled(true);
m_tlReplace->setEnabled(false);
//sets the right view appearance
raiseView();
//empties the view content
- eraseViewItems();
+
+ m_sv->clear();
}
void KAddStringDlg::slotSearchReplace()
{
m_option->m_searchingOnlyMode = false;
+ m_currentMap.clear();
m_rbSearchReplace->setChecked(true);
- m_edSearch->setEnabled(true);
m_edReplace->setEnabled(true);
- m_tlSearch->setEnabled(true);
m_tlReplace->setEnabled(true);
//sets the right view appearance
raiseView();
//empties the view content
- eraseViewItems();
+ m_sv->clear();
}
void KAddStringDlg::slotAddStringToView()
{
- if(m_option->m_searchingOnlyMode)
+ if (m_option->m_searchingOnlyMode)
{
TQString text = m_edSearch->text();
if(!(text.isEmpty() || columnContains(m_sv, text, 0)))
@@ -223,7 +201,7 @@ void KAddStringDlg::slotAddStringToView()
TQString searchText = m_edSearch->text(),
replaceText = m_edReplace->text();
- if(!(searchText.isEmpty() || replaceText.isEmpty() || columnContains(m_sv,searchText,0) || columnContains(m_sv,replaceText,1)))
+ if (!searchText.isEmpty() && !columnContains(m_sv, searchText, 0))
{
TQListViewItem* lvi = new TQListViewItem(m_sv);
lvi->setMultiLinesEnabled(true);
diff --git a/tdefilereplace/kaddstringdlg.h b/tdefilereplace/kaddstringdlg.h
index f39c296..276573e 100644
--- a/tdefilereplace/kaddstringdlg.h
+++ b/tdefilereplace/kaddstringdlg.h
@@ -2,7 +2,7 @@
KAddStringDlg.h - description
-------------------
begin : Sat Oct 16 1999
- copyright : (C) 1999 by Franois Dupoux
+ copyright : (C) 1999 by François Dupoux
(C) 2004 Emiliano Gulmini <emi_barbarossa@yahoo.it>
email : dupoux@dupoux.com
***************************************************************************/
@@ -33,10 +33,9 @@ class KAddStringDlg : public KAddStringDlgS
RCOptions* m_option;
TQListView* m_sv;
KeyValueMap m_currentMap;
- bool m_wantEdit;
public: //Constructors
- KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *parent=0, const char *name=0);
+ KAddStringDlg(RCOptions* info, TQWidget *parent=0, const char *name=0);
private slots:
void slotOK();
@@ -51,14 +50,6 @@ class KAddStringDlg : public KAddStringDlgS
* inits... the GUI :-)
*/
void initGUI();
- /**
- * Deletes all the items of the view
- */
- void eraseViewItems();
- /**
- * Deletes all the items of the map
- */
- void clearMap() { KeyValueMap m; m_option->m_mapStringsView = m; }
/**
* The view is actually a stack widget that contains two different views widget
*/
diff --git a/tdefilereplace/knewprojectdlg.cpp b/tdefilereplace/knewprojectdlg.cpp
index b7b268d..5119d2c 100644
--- a/tdefilereplace/knewprojectdlg.cpp
+++ b/tdefilereplace/knewprojectdlg.cpp
@@ -2,7 +2,7 @@
knewprojectdlg.cpp - description
-------------------
begin : Tue Dec 28 1999
- copyright : (C) 1999 by Fran�is Dupoux
+ copyright : (C) 1999 by François Dupoux
(C) 2004 Emiliano Gulmini <emi_barbarossa@yahoo.it>
email : dupoux@dupoux.com
***************************************************************************/
diff --git a/tdefilereplace/knewprojectdlg.h b/tdefilereplace/knewprojectdlg.h
index 82d2212..82e65e6 100644
--- a/tdefilereplace/knewprojectdlg.h
+++ b/tdefilereplace/knewprojectdlg.h
@@ -2,7 +2,7 @@
knewprojectdlg.h - description
-------------------
begin : Tue Dec 28 1999
- copyright : (C) 1999 by Fran�ois Dupoux
+ copyright : (C) 1999 by François Dupoux
(C) 2004 Emiliano Gulmini <emi_barbarossa@yahoo.it>
email : dupoux@dupoux.com
***************************************************************************/
diff --git a/tdefilereplace/koptionsdlg.cpp b/tdefilereplace/koptionsdlg.cpp
index 94dab7d..748c925 100644
--- a/tdefilereplace/koptionsdlg.cpp
+++ b/tdefilereplace/koptionsdlg.cpp
@@ -2,7 +2,7 @@
koptionsdlg.cpp - description
-------------------
begin : Tue Dec 28 1999
- copyright : (C) 1999 by Fran�is Dupoux
+ copyright : (C) 1999 by François Dupoux
(C) 2004 Emiliano Gulmini <emi_barbarossa@yahoo.it>
email : dupoux@dupoux.com
***************************************************************************/
diff --git a/tdefilereplace/koptionsdlg.h b/tdefilereplace/koptionsdlg.h
index 4654c5c..78375e5 100644
--- a/tdefilereplace/koptionsdlg.h
+++ b/tdefilereplace/koptionsdlg.h
@@ -2,7 +2,7 @@
koptionsdlg.h - description
-------------------
begin : Tue Dec 28 1999
- copyright : (C) 1999 by Fran�ois Dupoux
+ copyright : (C) 1999 by François Dupoux
(C) 2004 Emiliano Gulmini <emi_barbarossa@yahoo.it>
email : dupoux@dupoux.com
***************************************************************************/
@@ -27,7 +27,7 @@ class TDEConfig;
#include "koptionsdlgs.h"
/**
- *@author Fran�ois Dupoux
+ *@author François Dupoux
*/
class KOptionsDlg : public KOptionsDlgS
diff --git a/tdefilereplace/main.cpp b/tdefilereplace/main.cpp
index 1ca0ce2..f2374ac 100644
--- a/tdefilereplace/main.cpp
+++ b/tdefilereplace/main.cpp
@@ -35,7 +35,7 @@ static TDECmdLineOptions options[] =
int main(int argc, char *argv[])
{
TDEAboutData about("tdefilereplace", I18N_NOOP("TDEFileReplace"), version, description,
- TDEAboutData::License_GPL_V2, "(C) 2004-2005 Andras Mantia\n(C) 2004-2005 Emiliano Gulmini\n(C) 1999-2002 Francois Dupoux", I18N_NOOP("Part of the KDEWebDev module."),
+ TDEAboutData::License_GPL_V2, "(C) 2004-2005 Andras Mantia\n(C) 2004-2005 Emiliano Gulmini\n(C) 1999-2002 François Dupoux", I18N_NOOP("Part of the TDEUtils module."),
"http://www.kdewebdev.org");
about.addAuthor("Andras Mantia", I18N_NOOP("Shell author, KPart creator, co-maintainer"), "amantia@kde.org");
diff --git a/tdefilereplace/tdefilereplace.desktop b/tdefilereplace/tdefilereplace.desktop
index 57556f7..e0cfcad 100644
--- a/tdefilereplace/tdefilereplace.desktop
+++ b/tdefilereplace/tdefilereplace.desktop
@@ -1,25 +1,13 @@
[Desktop Entry]
Name=TDEFileReplace
-Name[hi]=के-फ़ाइल-रिप्लेस
-Name[ne]=बदल्ने केडीई फाइल
-Name[pa]=ਕੇ-ਫਾਇਲ-ਬਦਲੋ
-Name[sk]=KFile zameniť
-Name[sv]=Kfilereplace
-Name[ta]=Kகோப்பு இடமாற்று
-Name[tg]=KФайлро ҷойгузор кардан
-Name[tr]=K Dosya Değiştirme
-Exec=tdefilereplace %i %m -caption "%c"
-Icon=tdefilereplace
-Type=Application
-X-DocPath=tdefilereplace/index.html
-Terminal=false
+
GenericName=Search & Replace Tool
GenericName[bg]=Търсене и замяна
GenericName[br]=Ostilh klask hag erlec'hiañ
GenericName[ca]=Eina cerca i substitueix
GenericName[cs]=Nástroj pro vyhledání a nahrazení
GenericName[da]=Søg og erstat-værktøj
-GenericName[de]=Suchen & Ersetzen Werkzeug
+GenericName[de]=Programm zum Suchen & Ersetzen
GenericName[el]=Εργαλείο αναζήτησης & αντικατάστασης
GenericName[es]=Herramienta de búsqueda y reemplazo
GenericName[et]=Otsimise ja asendamise tööriist
@@ -52,4 +40,53 @@ GenericName[uk]=Засіб пошуку та заміни
GenericName[zh_CN]=搜索替换工具
GenericName[zh_HK]=搜尋及取代工具
GenericName[zh_TW]=搜尋及取代工具
+
+Comment=A batch search and replace tool
+Comment[bg]=Търсене и замяна във фонов режим
+Comment[ca]=Una eina per a la cerca i substitució per lots
+Comment[cs]=Dávkový nástroj pro hledání a nahrazování
+Comment[da]=Søg- og erstat-gruppekørselsværktøj
+Comment[de]=Ein Programm zum Suchen und Ersetzen im Stapelbetrieb
+Comment[el]= Εργαλείο πολλαπλής αναζήτησης και αντικατάστασης
+Comment[es]=Una herramienta de búsqueda y reemplazo por lotes
+Comment[et]=Otsimise ja asendamise tööriist
+Comment[eu]=Bilaketa eta ordezkapen tresna
+Comment[fa]=ابزار جستجو و جایگزینی دسته‌ای
+Comment[fi]=Batchien etsintä- ja korvaustyökalu
+Comment[fr]=Un outil de recherche et de remplacement de texte en série.
+Comment[gl]=Unha utilidade de busca e reemprazo por lotes
+Comment[hi]=एक खोज तथा बदल उपकरण
+Comment[hu]=Sok fájl kezelésére alkalmas kereső- és cserélőprogram
+Comment[is]=Tól til að leita að texta og skipta út
+Comment[it]=Uno strumento per la ricerca e la sostituzione in sequenza
+Comment[ja]=バッチ検索および置換ツール
+Comment[ka]=ჯგუფური ძიების და ჩანაცვლების ხელსაწყო
+Comment[lt]=Paketinis paieškos ir keitimo įrankis
+Comment[ms]=Gugusan alatan cari dan ganti
+Comment[nds]=En Söök- un Utwesselwarktüüch för Stapelbedrief
+Comment[ne]=एउटा समूह खोजी गर्ने र बदल्ने उपकरण
+Comment[nl]=Een gereedschap voor zoeken en vervangen
+Comment[pl]=Narzędzie do wyszukiwania i zamiany
+Comment[pt]=Uma ferramenta de procura e substituição por atacado
+Comment[pt_BR]=Uma ferramenta de substituição e pesquisa batch
+Comment[ru]=Пакетный поиск и замена
+Comment[sk]=Dávkovací nástroj pre nájsť a zameniť
+Comment[sl]=Orodje serijskega iskanja in zamenjevanja
+Comment[sr]=Алат за пакетну претрагу и замену
+Comment[sr@Latn]=Alat za paketnu pretragu i zamenu
+Comment[sv]=Ett sök- och ersättningsverktyg
+Comment[ta]=தொகுதி தேடல் மற்றும் கருவி இடமாற்றல்
+Comment[tg]=Ҷустуҷӯи пакет ва ивази асбоб
+Comment[tr]=Bir toplu arama ve değiştirme aracı
+Comment[uk]=Засіб пакетного пошуку та заміни
+Comment[zh_CN]=批量搜索替换工具
+Comment[zh_HK]=批次搜尋及取代工具
+Comment[zh_TW]=批次搜尋及取代工具
+
+Exec=tdefilereplace %i %m -caption "%c"
+Icon=tdefilereplace
+Type=Application
+X-DocPath=tdefilereplace/index.html
+Terminal=false
+
Categories=Qt;TDE;Utility;X-TDE-Utilities-File;
diff --git a/tdefilereplace/tdefilereplaceiface.h b/tdefilereplace/tdefilereplaceiface.h
index 2d87e08..c998eae 100644
--- a/tdefilereplace/tdefilereplaceiface.h
+++ b/tdefilereplace/tdefilereplaceiface.h
@@ -1,7 +1,7 @@
/***************************************************************************
tdefilereplaceif.h - description
-------------------
- copyright : (C) 1999 by Franois Dupoux
+ copyright : (C) 1999 by François Dupoux
(C) 2003 Andras Mantia
email : dupoux@dupoux.com, amantia@kde.org
***************************************************************************/
diff --git a/tdefilereplace/tdefilereplacelib.cpp b/tdefilereplace/tdefilereplacelib.cpp
index cf9b578..90c8ef4 100644
--- a/tdefilereplace/tdefilereplacelib.cpp
+++ b/tdefilereplace/tdefilereplacelib.cpp
@@ -3,7 +3,7 @@
-------------------
begin : lun mai 3 20:19:52 CEST 1999
- copyright : (C) 1999 by Franois Dupoux
+ copyright : (C) 1999 by François Dupoux
(C) 2003 Andras Mantia <amantia@kde.org>
(C) 2004 Emiliano Gulmini <emi_barbarossa@yahoo.it>
email : dupoux@dupoux.com
@@ -64,31 +64,6 @@ TQString TDEFileReplaceLib::formatFullPath(const TQString& basePath, const TQStr
return fullPath;
}
-/**
- Add an extension to a filename, or a filepath
- Parameters::.....* fileName: filename or filepath (it can have already the extension)
- .................* extension: extension to add without "." (ex: "html", "kfr")
- Return values:...* Filename / Filepath with the extension
-*/
-TQString TDEFileReplaceLib::addExtension(const TQString& fileName, const TQString& extension)
-{
- TQString fullExtension = ".";
- TQString fname = fileName;
-
- fullExtension.append(extension);
-
- // filename cannot contain ".ext" ==> Add it
- if(fname.length() <= fullExtension.length())
- fname.append(fullExtension);
- else // filename can contain ".ext"
- {
- if (fname.right(fullExtension.length()) != fullExtension)
- fname.append(fullExtension);
- }
-
- return fname;
-}
-
TQString TDEFileReplaceLib::formatFileSize(double size)
{
TQString stringSize;
@@ -119,82 +94,6 @@ TQString TDEFileReplaceLib::formatFileSize(double size)
return stringSize;
}
-void TDEFileReplaceLib::convertOldToNewKFRFormat(const TQString& fileName, TDEListView* stringView)
-{
- //this method convert old format in new XML-based format
- typedef struct
- {
- char pgm[13]; // Must be "TDEFileReplace" : like MZ for EXE files
- int stringNumber; // Number of strings in file
- char reserved[64]; // Reserved for future use
- } KFRHeader;
-
- KFRHeader head;
-
- FILE* f = fopen(fileName.ascii(),"rb");
- int err = fread(&head, sizeof(KFRHeader), 1, f);
- TQString pgm(head.pgm);
-
- if(!f || (err != 1) || (pgm != "TDEFileReplace"))
- {
- KMessageBox::error(0, i18n("<qt>Cannot open the file <b>%1</b> and load the string list. This file seems not to be a valid old kfr file or it is broken.</qt>").arg(fileName));
- return ;
- }
-
- stringView->clear();
-
- int oldTextSize,
- newTextSize,
- errors = 0,
- stringSize;
- TQStringList l;
-
- int i ;
- for (i=0; i < head.stringNumber; i++)
- {
- errors += (fread(&oldTextSize, sizeof(int), 1, f)) != 1;
- errors += (fread(&newTextSize, sizeof(int), 1, f)) != 1;
- if(errors > 0)
- KMessageBox::error(0, i18n("Cannot read data."));
- else
- {
- stringSize = ((oldTextSize > newTextSize) ? oldTextSize : newTextSize) + 2;
- char* oldString = (char*) malloc(stringSize+10),
- * newString = (char*) malloc(stringSize+10);
- memset(oldString, 0, stringSize);
- memset(newString,0, stringSize);
- if (oldString == 0 || newString == 0)
- KMessageBox::error(0, i18n("Out of memory."));
- else
- {
- if (fread(oldString, oldTextSize, 1, f) != 1)
- KMessageBox::error(0, i18n("Cannot read data."));
- else
- {
- if (newTextSize > 0) // If there is a Replace text
- {
- if (fread(newString, newTextSize, 1, f) != 1)
- KMessageBox::error(0, i18n("Cannot read data."));
- else
- {
- TQListViewItem* lvi = new TQListViewItem(stringView);
- lvi->setText(0,oldString);
- lvi->setText(1,newString);
-
- if(newString)
- free(newString);
- if(oldString)
- free(oldString);
- }
- }
- }
- }
- }
- }
- fclose(f);
- return ;
- }
-
bool TDEFileReplaceLib::isAnAccessibleFile(const TQString& filePath, const TQString& fileName, RCOptions* info)
{
TQString bkExt = info->m_backupExtension;
diff --git a/tdefilereplace/tdefilereplacelib.h b/tdefilereplace/tdefilereplacelib.h
index d04f8a3..45dd0a4 100644
--- a/tdefilereplace/tdefilereplacelib.h
+++ b/tdefilereplace/tdefilereplacelib.h
@@ -3,7 +3,7 @@
-------------------
begin : lun mai 3 20:19:52 CEST 1999
- copyright : (C) 1999 by Franois Dupoux
+ copyright : (C) 1999 by François Dupoux
(C) 2003 Andras Mantia <amantia@kde.org>
(C) 2004 Emiliano Gulmini <emi_barbarossa@yahoo.it>
email : dupoux@dupoux.com
@@ -40,21 +40,9 @@ class TDEFileReplaceLib
*/
static TQString formatFullPath(const TQString& basePath, const TQString& fileName);
- /**
- Add an extension to a filename, or a filepath
- Parameters::.....* filename: filename or filepath (it can have already the extension)
- .................* extension: extension to add without "." (ex: "html", "kfr")
- Return values:...* Filename / Filepath with the extension
- */
- static TQString addExtension(const TQString& fileName, const TQString& extension);
-
static TQString formatFileSize(double size);
/**
- converts the old kfr format file in the new xml-based format.
- */
- static void convertOldToNewKFRFormat(const TQString& fileName, TDEListView* stringView);
- /**
Verifies that files, which we are scanning, respect some
conditions
*/
diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp
index 455b69c..14d9ff3 100644
--- a/tdefilereplace/tdefilereplacepart.cpp
+++ b/tdefilereplace/tdefilereplacepart.cpp
@@ -102,7 +102,7 @@ TDEFileReplacePart::~TDEFileReplacePart()
void TDEFileReplacePart::slotSetNewParameters()
{
launchNewProjectDialog(KURL());
- m_view->changeView(m_option->m_searchingOnlyMode);
+ m_view->changeViews(m_option->m_searchingOnlyMode);
emit setStatusBarText(i18n("Ready."));
}
@@ -159,7 +159,7 @@ void TDEFileReplacePart::slotSearchingOperation()
m_option->m_searchingOnlyMode = true;
- resetActions();
+ updateGUI();
m_searchingOperation = true;
@@ -223,7 +223,7 @@ void TDEFileReplacePart::slotReplacingOperation()
m_option->m_searchingOnlyMode = false;
- resetActions();
+ updateGUI();
m_searchingOperation = false;
@@ -242,7 +242,7 @@ void TDEFileReplacePart::slotStop()
emit setStatusBarText(i18n("Stopping..."));
m_stop = true;
TQApplication::restoreOverrideCursor();
- resetActions();
+ updateGUI();
}
void TDEFileReplacePart::slotCreateReport()
@@ -286,13 +286,7 @@ void TDEFileReplacePart::slotCreateReport()
Report report(m_option, rv, sv);
report.createDocument(documentPath);
- //resetActions();
-}
-
-void TDEFileReplacePart::slotStringsAdd()
-{
- m_view->slotStringsAdd();
- resetActions();
+ //updateGUI();
}
void TDEFileReplacePart::slotQuickStringsAdd()
@@ -328,115 +322,45 @@ void TDEFileReplacePart::slotQuickStringsAdd()
}
}
-void TDEFileReplacePart::slotStringsDeleteItem()
-{
- m_view->slotStringsDeleteItem();
- resetActions();
-}
-
-void TDEFileReplacePart::slotStringsEmpty()
-{
- m_view->slotStringsEmpty();
- resetActions();
-}
-
-void TDEFileReplacePart::slotStringsEdit()
-{
- m_view->slotStringsEdit();
- resetActions();
-}
-
-void TDEFileReplacePart::slotStringsSave()
-{
- m_view->slotStringsSave();
-}
-
-void TDEFileReplacePart::slotStringsLoad()
-{
- // Selects the file to load from
- TQString menu = "*.kfr|" + i18n("TDEFileReplace strings") + " (*.kfr)\n*|"+i18n("All Files") + " (*)";
- TQString fileName = KFileDialog::getOpenFileName(TQString(), menu, m_w, i18n("Load Strings From File"));
-
- if(!fileName.isEmpty())
- loadRulesFile(fileName);
-
- resetActions();
-}
-
-void TDEFileReplacePart::slotStringsInvertCur()
-{
- m_view->stringsInvert(false);
- resetActions();
-}
-
-void TDEFileReplacePart::slotStringsInvertAll()
-{
- m_view->stringsInvert(true);
- resetActions();
-}
-
-void TDEFileReplacePart::slotOpenRecentStringFile(const KURL& urlFile)
-{
- TQString fileName;
-
- // Downloads file if need (if url is "http://...")
- if (!(TDEIO::NetAccess::download(urlFile, fileName, 0)))
- return;
-
- // Checks it's not a directory
- TQFileInfo fileInfo;
- fileInfo.setFile(fileName);
- if(fileInfo.isDir())
- {
- KMessageBox::error(m_w, i18n("Cannot open folders."));
- return;
- }
-
- loadRulesFile(fileName);
- resetActions();
-}
-
void TDEFileReplacePart::slotOptionRecursive()
{
m_option->m_recursive = !m_option->m_recursive;
- resetActions();
+ updateGUI();
}
void TDEFileReplacePart::slotOptionBackup()
{
m_option->m_backup = !m_option->m_backup;
- resetActions();
+ updateGUI();
}
void TDEFileReplacePart::slotOptionCaseSensitive()
{
m_option->m_caseSensitive = !m_option->m_caseSensitive;
- resetActions();
+ updateGUI();
}
void TDEFileReplacePart::slotOptionVariables()
{
m_option->m_variables = !m_option->m_variables;
- resetActions();
+ updateGUI();
}
void TDEFileReplacePart::slotOptionRegularExpressions()
{
m_option->m_regularExpressions = !m_option->m_regularExpressions;
- resetActions();
+ updateGUI();
}
void TDEFileReplacePart::slotOptionPreferences()
{
KOptionsDlg dlg(m_option, m_w, 0);
-
- if(!dlg.exec())
+ if (!dlg.exec())
+ {
return;
-
- //updating m_view
+ }
m_view->updateOptions(m_option);
-
- resetActions();
+ updateGUI();
}
void TDEFileReplacePart::showAboutApplication()
@@ -462,31 +386,30 @@ void TDEFileReplacePart::reportBug()
dlg.exec();
}
-void TDEFileReplacePart::resetActions()
+void TDEFileReplacePart::updateGUI()
{
- TDEListView* rv = m_view->getResultsView(),
- * sv = m_view->getStringsView();
+ TDEListView *rv = m_view->getResultsView();
+ TDEListView *sv = m_view->getStringsView();
- bool hasItems = (sv->firstChild() != 0),
- searchOnlyMode = m_option->m_searchingOnlyMode;
+ bool hasResults = (rv->firstChild() != 0);
+ bool hasStrings = (sv->firstChild() != 0);
+ bool searchOnlyMode = m_option->m_searchingOnlyMode;
// File
actionCollection()->action("new_project")->setEnabled(true);
- actionCollection()->action("search")->setEnabled(hasItems && searchOnlyMode);
- actionCollection()->action("file_simulate")->setEnabled(hasItems && !searchOnlyMode);
- actionCollection()->action("replace")->setEnabled(hasItems && !searchOnlyMode);
- actionCollection()->action("save_results")->setEnabled(hasItems);
+ actionCollection()->action("search")->setEnabled(hasStrings && searchOnlyMode);
+ actionCollection()->action("file_simulate")->setEnabled(hasStrings && !searchOnlyMode);
+ actionCollection()->action("replace")->setEnabled(hasStrings && !searchOnlyMode);
actionCollection()->action("stop")->setEnabled(false);
// Strings
actionCollection()->action("strings_add")->setEnabled(true);
- actionCollection()->action("strings_del")->setEnabled(hasItems);
- actionCollection()->action("strings_empty")->setEnabled(hasItems);
- actionCollection()->action("strings_edit")->setEnabled(hasItems);
- actionCollection()->action("strings_save")->setEnabled(hasItems);
+ actionCollection()->action("strings_del")->setEnabled(hasStrings);
+ actionCollection()->action("strings_empty")->setEnabled(hasStrings);
+ actionCollection()->action("strings_save")->setEnabled(hasStrings);
actionCollection()->action("strings_load")->setEnabled(true);
- actionCollection()->action("strings_invert")->setEnabled(hasItems && !searchOnlyMode);
- actionCollection()->action("strings_invert_all")->setEnabled(hasItems && !searchOnlyMode);
+ actionCollection()->action("strings_invert")->setEnabled(hasStrings && !searchOnlyMode);
+ actionCollection()->action("strings_invert_all")->setEnabled(hasStrings && !searchOnlyMode);
// Options
actionCollection()->action("options_recursive")->setEnabled(true);
@@ -496,36 +419,41 @@ void TDEFileReplacePart::resetActions()
actionCollection()->action("options_regularexpressions")->setEnabled(true);
actionCollection()->action("configure_tdefilereplace")->setEnabled(true);
- hasItems = (rv->firstChild() != 0);
-
// Results
- actionCollection()->action("results_infos")->setEnabled(hasItems);
- actionCollection()->action("results_openfile")->setEnabled(hasItems);
+ actionCollection()->action("results_infos")->setEnabled(hasResults);
+ actionCollection()->action("results_openfile")->setEnabled(hasResults);
+ actionCollection()->action("results_openfilewith")->setEnabled(hasResults);
if (actionCollection()->action("results_editfile"))
- actionCollection()->action("results_editfile")->setEnabled(hasItems);
- actionCollection()->action("results_opendir")->setEnabled(hasItems);
- actionCollection()->action("results_delete")->setEnabled(hasItems);
- actionCollection()->action("results_treeexpand")->setEnabled(hasItems);
- actionCollection()->action("results_treereduce")->setEnabled(hasItems);
+ {
+ actionCollection()->action("results_editfile")->setEnabled(hasResults);
+ }
+ actionCollection()->action("results_opendir")->setEnabled(hasResults);
+ actionCollection()->action("results_removeentry")->setEnabled(hasResults);
+ actionCollection()->action("results_delete")->setEnabled(hasResults);
+ actionCollection()->action("results_treeexpand")->setEnabled(hasResults);
+ actionCollection()->action("results_treereduce")->setEnabled(hasResults);
+ actionCollection()->action("results_create_report")->setEnabled(hasResults);
+ actionCollection()->action("results_save")->setEnabled(hasResults);
+ actionCollection()->action("results_load")->setEnabled(true);
// Updates menus and toolbar
- ((TDEToggleAction* ) actionCollection()->action("options_recursive"))->setChecked(m_option->m_recursive);
- ((TDEToggleAction* ) actionCollection()->action("options_backup"))->setChecked(m_option->m_backup && !searchOnlyMode);
- ((TDEToggleAction* ) actionCollection()->action("options_case"))->setChecked(m_option->m_caseSensitive);
- ((TDEToggleAction* ) actionCollection()->action("options_var"))->setChecked(m_option->m_variables && !searchOnlyMode);
- ((TDEToggleAction* ) actionCollection()->action("options_regularexpressions"))->setChecked(m_option->m_regularExpressions);
+ ((TDEToggleAction*) actionCollection()->action("options_recursive"))->setChecked(m_option->m_recursive);
+ ((TDEToggleAction*) actionCollection()->action("options_backup"))->setChecked(m_option->m_backup && !searchOnlyMode);
+ ((TDEToggleAction*) actionCollection()->action("options_case"))->setChecked(m_option->m_caseSensitive);
+ ((TDEToggleAction*) actionCollection()->action("options_var"))->setChecked(m_option->m_variables && !searchOnlyMode);
+ ((TDEToggleAction*) actionCollection()->action("options_regularexpressions"))->setChecked(m_option->m_regularExpressions);
}
//PUBLIC METHODS
TDEAboutData* TDEFileReplacePart::createAboutData()
{
- TDEAboutData * aboutData = new TDEAboutData("tdefilereplacepart",
+ TDEAboutData *aboutData = new TDEAboutData("tdefilereplacepart",
I18N_NOOP("TDEFileReplacePart"),
KFR_VERSION,
I18N_NOOP( "Batch search and replace tool."),
TDEAboutData::License_GPL_V2,
- "(C) 1999-2002 Fran�is Dupoux\n(C) 2003-2004 Andras Mantia\n(C) 2004 Emiliano Gulmini", I18N_NOOP("Part of the KDEWebDev module."), "http://www.kdewebdev.org");
- aboutData->addAuthor("Fran�is Dupoux",
+ "(C) 1999-2002 François Dupoux\n(C) 2003-2004 Andras Mantia\n(C) 2004 Emiliano Gulmini", I18N_NOOP("Part of the TDEUtils module."), "http://www.kdewebdev.org");
+ aboutData->addAuthor("François Dupoux",
I18N_NOOP("Original author of the TDEFileReplace tool"),
"dupoux@dupoux.com");
aboutData->addAuthor("Emiliano Gulmini",
@@ -553,7 +481,7 @@ bool TDEFileReplacePart::openURL(const KURL &url)
return launchNewProjectDialog(url);
else
{
- resetActions();
+ updateGUI();
return true;
}
}
@@ -576,25 +504,28 @@ void TDEFileReplacePart::initGUI()
break;
}
}
+
+ // GUI
+ connect(m_view, TQT_SIGNAL(updateGUI()), this, TQT_SLOT(updateGUI()));
+
// File
(void)new TDEAction(i18n("Customize Search/Replace Session..."), "projectopen", TDEShortcut(CTRL + Key_F), TQT_TQOBJECT(this), TQT_SLOT(slotSetNewParameters()), actionCollection(), "new_project");
(void)new TDEAction(i18n("&Search"), "filesearch", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearchingOperation()), actionCollection(), "search");
(void)new TDEAction(i18n("S&imulate"), "filesimulate", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate");
(void)new TDEAction(i18n("&Replace"), "filereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplacingOperation()), actionCollection(), "replace");
(void)new TDEAction(i18n("Sto&p"), "process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "stop");
- (void)new TDEAction(i18n("Cre&ate Report File..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateReport()), actionCollection(), "save_results");
+ (void)new TDEAction(i18n("Cre&ate Report File..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateReport()), actionCollection(), "results_create_report");
+ (void)new TDEAction(i18n("&Save Results List to File..."), "document-save-as", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultSave()), actionCollection(), "results_save");
+ (void)new TDEAction(i18n("&Load Results List From File..."), "unsortedList", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultLoad()), actionCollection(), "results_load");
// Strings
- (void)new TDEAction(i18n("&Add String..."), "editadd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsAdd()), actionCollection(), "strings_add");
-
- (void)new TDEAction(i18n("&Delete String"), "editremove", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del");
- (void)new TDEAction(i18n("&Empty Strings List"), "edit-delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty");
- (void)new TDEAction(i18n("Edit Selected String..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsEdit()), actionCollection(), "strings_edit");
- (void)new TDEAction(i18n("&Save Strings List to File..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsSave()), actionCollection(), "strings_save");
- (void)new TDEAction(i18n("&Load Strings List From File..."), "unsortedList", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsLoad()), actionCollection(), "strings_load");
- (void)new TDERecentFilesAction(i18n("&Load Recent Strings Files"), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenRecentStringFile(const KURL&)), actionCollection(),"strings_load_recent");
- (void)new TDEAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert");
- (void)new TDEAction(i18n("&Invert All Strings (search <--> replace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all");
+ (void)new TDEAction(i18n("&Add String..."), "editadd", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsAdd()), actionCollection(), "strings_add");
+ (void)new TDEAction(i18n("&Delete String"), "editremove", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del");
+ (void)new TDEAction(i18n("&Empty Strings List"), "edit-delete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty");
+ (void)new TDEAction(i18n("&Save Strings List to File..."), "document-save-as", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsSave()), actionCollection(), "strings_save");
+ (void)new TDEAction(i18n("&Load Strings List From File..."), "unsortedList", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsLoad()), actionCollection(), "strings_load");
+ (void)new TDEAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert");
+ (void)new TDEAction(i18n("&Invert All Strings (search <--> replace)"), "invert", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all");
// Options
(void)new TDEToggleAction(i18n("&Include Sub-Folders"), "recursive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRecursive()), actionCollection(), "options_recursive");
@@ -606,20 +537,22 @@ void TDEFileReplacePart::initGUI()
// Results
(void)new TDEAction(i18n("&Properties"), "informations", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultProperties()), actionCollection(), "results_infos");
- (void)new TDEAction(i18n("&Open"), "document-new", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultOpen()), actionCollection(), "results_openfile");
-
+ (void)new TDEAction(i18n("&Open"), "document-open", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultOpen()), actionCollection(), "results_openfile");
+ (void)new TDEAction(i18n("Open &With..."), "document-open", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultOpenWith()), actionCollection(), "results_openfilewith");
if(quantaFound)
- {
- (void)new TDEAction(i18n("&Edit in Quanta"), "quanta", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultEdit()), actionCollection(), "results_editfile");
- }
- (void)new TDEAction(i18n("Open Parent &Folder"), "document-open", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir");
+ {
+ (void)new TDEAction(i18n("&Edit in Quanta"), "quanta", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultEdit()), actionCollection(), "results_editfile");
+ }
+ (void)new TDEAction(i18n("Open Parent &Folder"), "go-up", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir");
+ (void)new TDEAction(i18n("Remove &Entry"), "edit-clear", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultRemoveEntry()), actionCollection(), "results_removeentry");
(void)new TDEAction(i18n("&Delete"), "edit-delete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDelete()), actionCollection(), "results_delete");
(void)new TDEAction(i18n("E&xpand Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand");
(void)new TDEAction(i18n("&Reduce Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce");
+
+ // Help
(void)new TDEAction(i18n("&About TDEFileReplace"), "tdefilereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace");
(void)new TDEAction(i18n("TDEFileReplace &Handbook"), "help", 0, TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdefilereplace");
(void)new TDEAction(i18n("&Report Bug"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(reportBug()), actionCollection(), "report_bug");
-
}
void TDEFileReplacePart::initView()
@@ -645,7 +578,6 @@ void TDEFileReplacePart::freezeActions()
actionCollection()->action("strings_add")->setEnabled(false);
actionCollection()->action("strings_del")->setEnabled(false);
actionCollection()->action("strings_empty")->setEnabled(false);
- actionCollection()->action("strings_edit")->setEnabled(false);
actionCollection()->action("strings_save")->setEnabled(false);
actionCollection()->action("strings_load")->setEnabled(false);
actionCollection()->action("strings_invert")->setEnabled(false);
@@ -659,8 +591,11 @@ void TDEFileReplacePart::freezeActions()
actionCollection()->action("results_infos")->setEnabled(false);
actionCollection()->action("results_openfile")->setEnabled(false);
if (actionCollection()->action("results_editfile"))
+ {
actionCollection()->action("results_editfile")->setEnabled(false);
+ }
actionCollection()->action("results_opendir")->setEnabled(false);
+ actionCollection()->action("results_removeentry")->setEnabled(false);
actionCollection()->action("results_delete")->setEnabled(false);
actionCollection()->action("results_treeexpand")->setEnabled(false);
actionCollection()->action("results_treereduce")->setEnabled(false);
@@ -688,8 +623,6 @@ void TDEFileReplacePart::loadOptions()
{
m_config->setGroup("General Options");
- m_option->m_recentStringFileList = m_config->readListEntry(rcRecentFiles);
-
m_option->m_searchingOnlyMode = m_config->readBoolEntry(rcSearchMode,SearchModeOption);
m_config->setGroup("Options");
@@ -827,7 +760,6 @@ void TDEFileReplacePart::saveOptions()
{
m_config->setGroup("General Options");
- m_config->writeEntry(rcRecentFiles, m_option->m_recentStringFileList);
m_config->writeEntry(rcSearchMode,m_option->m_searchingOnlyMode);
m_config->setGroup("Options");
@@ -1463,7 +1395,7 @@ void TDEFileReplacePart::search(const TQString& currentDir, const TQString& file
else
capturedText = line.mid(pos,strKey.length());
- msg = i18n(" Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10));
+ msg = i18n("Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10));
tempItem->setMultiLinesEnabled(true);
tempItem->setText(0,msg);
occurrence = 1;
@@ -1503,7 +1435,7 @@ void TDEFileReplacePart::search(const TQString& currentDir, const TQString& file
pos = line.find(strKey,pos+strKey.length());
}
- msg = i18n(" Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10));
+ msg = i18n("Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10));
if(!item)
item = new TDEListViewItem(rv);
@@ -1559,90 +1491,6 @@ void TDEFileReplacePart::loadViewContent()
m_replacementMap = tempMap;
}
-void TDEFileReplacePart::loadRulesFile(const TQString& fileName)
-{
- /* Loads a file with kfr extension.
- * creates a xml document and browses it*/
- TQDomDocument doc("mydocument");
- TQFile file(fileName);
- TDEListView* sv = m_view->getStringsView();
-
- if(!file.open(IO_ReadOnly))
- {
- KMessageBox::error(m_w, i18n("<qt>Cannot open the file <b>%1</b> and load the string list.</qt>").arg(fileName));
- return ;
- }
-
- if(!doc.setContent(&file))
- {
- file.close();
-
- KMessageBox::information(m_w, i18n("<qt>File <b>%1</b> seems not to be written in new kfr format. Remember that the old kfr format will be soon abandoned. You can convert your old rules files by simply saving them with tdefilereplace.</qt>").arg(fileName),i18n("Warning"));
-
- TDEFileReplaceLib::convertOldToNewKFRFormat(fileName, sv);
-
- return;
- }
- else
- file.close();
-
- //clears view
- sv->clear();
-
- TQDomElement docElem = doc.documentElement();
- TQDomNode n = docElem.firstChild();
- TQString searchAttribute = n.toElement().attribute("search").latin1();
-
- KeyValueMap docMap;
-
- if(searchAttribute.isNull() || searchAttribute.isEmpty())
- {
- int answer = KMessageBox::warningYesNo(m_w, i18n("<qt>The format of kfr files has been changed; attempting to load <b>%1</b>. Please see the KFilereplace manual for details. Do you want to load a search-and-replace list of strings?</qt>").arg(fileName),i18n("Warning"),i18n("Load"),i18n("Do Not Load"));
-
- if(answer == KMessageBox::Yes)
- searchAttribute = "false";
- else
- searchAttribute = "true";
- }
- //Verifies the search mode
- if(searchAttribute == "true")
- m_option->m_searchingOnlyMode = true;
- else
- m_option->m_searchingOnlyMode = false;
-
- //Refreshes the view appearances
- m_view->changeView(m_option->m_searchingOnlyMode);
- //Goes to next tag
- n = n.nextSibling();
- //Reads the string list
- while(!n.isNull())
- {
- TQDomElement e = n.toElement(); // tries to convert the node to an element.
- if(!e.isNull())
- {
- TQString oldString = e.firstChild().toElement().text(),
- newString = e.lastChild().toElement().text();
- docMap[oldString] = newString;
- }
- n = n.nextSibling();
- }
-
- // Adds file to "load strings form file" menu
- TQStringList fileList = m_option->m_recentStringFileList;
- if(!fileList.contains(fileName))
- {
- fileList.append(fileName);
- ((TDERecentFilesAction* ) actionCollection()->action("strings_load_recent"))->setItems(fileList);
- m_option->m_recentStringFileList = fileList;
- }
-
- m_view->changeView(m_option->m_searchingOnlyMode);
-
- m_view->loadMap(docMap);
-
- //resetActions();
-}
-
bool TDEFileReplacePart::launchNewProjectDialog(const KURL & startURL)
{
if(!startURL.isEmpty())
@@ -1662,7 +1510,7 @@ bool TDEFileReplacePart::launchNewProjectDialog(const KURL & startURL)
m_view->updateOptions(m_option);
- resetActions();
+ updateGUI();
return true;
}
diff --git a/tdefilereplace/tdefilereplacepart.desktop b/tdefilereplace/tdefilereplacepart.desktop
index 84157ab..43bad08 100644
--- a/tdefilereplace/tdefilereplacepart.desktop
+++ b/tdefilereplace/tdefilereplacepart.desktop
@@ -1,15 +1,52 @@
[Desktop Entry]
-Type=Service
-MimeType=inode/directory
-Icon=tdefilereplace
-X-TDE-ServiceTypes=KParts/ReadOnlyPart
-X-TDE-Library=libtdefilereplacepart
+Name=TDEFileReplace
+
+GenericName=File Replace View
+GenericName[bg]=Преглед на файловете за замяна
+GenericName[ca]=Vista per a substituir fitxers
+GenericName[cs]=Nahrazení souborů
+GenericName[da]=Filerstatningsvisning
+GenericName[de]=Ansicht zum Ersetzen von Dateien
+GenericName[el]=Προβολή αντικατάστασης αρχείου
+GenericName[es]=Vista de reemplazo de archivo
+GenericName[et]=Failide asendamise vaade
+GenericName[eu]=Fitxategi ordezkapen ikuspegia
+GenericName[fa]=نمای جایگزینی پرونده
+GenericName[fi]=Tiedoston korvausnäyttö
+GenericName[fr]=Remplacement de fichiers
+GenericName[gl]=Vista de reemprazo de ficheiro
+GenericName[hu]=Fájlcserélő nézet
+GenericName[is]=Texta útskiptingarsýn
+GenericName[it]=Vista di sostituzione file
+GenericName[ja]=ファイル置換ビュー
+GenericName[ka]=ფაილის ჩანაცვლების ხედი
+GenericName[lt]=Keitimų bylose vaizdas
+GenericName[ms]=Paparan Ganti Fail
+GenericName[nds]=Datei-Utwesselansicht
+GenericName[ne]=फाइल बदल्ने दृश्य
+GenericName[nl]=Weergave van bestanden vervangen
+GenericName[pa]=ਫਾਇਲ ਤਬਦੀਲ ਝਲਕ
+GenericName[pl]=Widok zamiany w plikach
+GenericName[pt]=Vista de Substituição de Ficheiros
+GenericName[pt_BR]=Visão de Substituição de Arquivos
+GenericName[ru]=Средство поиска и замены в файлах
+GenericName[sk]=Pohľad zámeny súboru
+GenericName[sl]=Prikaz zamenjave datotek
+GenericName[sr]=Приказ замена у фајловима
+GenericName[sr@Latn]=Prikaz zamena u fajlovima
+GenericName[sv]=Filersättningsvy
+GenericName[ta]=கோப்பு இடமாற்று காட்சி
+GenericName[uk]=Перегляд заміни в файлах
+GenericName[zh_CN]=文件替换视图
+GenericName[zh_HK]=檔案取代檢視模式
+GenericName[zh_TW]=檔案取代檢視
+
Comment=A batch search and replace tool
Comment[bg]=Търсене и замяна във фонов режим
Comment[ca]=Una eina per a la cerca i substitució per lots
Comment[cs]=Dávkový nástroj pro hledání a nahrazování
Comment[da]=Søg- og erstat-gruppekørselsværktøj
-Comment[de]=Ein Werkzeug zum Suchen und Ersetzen im Stapelbetrieb
+Comment[de]=Ein Programm zum Suchen und Ersetzen im Stapelbetrieb
Comment[el]= Εργαλείο πολλαπλής αναζήτησης και αντικατάστασης
Comment[es]=Una herramienta de búsqueda y reemplazo por lotes
Comment[et]=Otsimise ja asendamise tööriist
@@ -45,51 +82,9 @@ Comment[uk]=Засіб пакетного пошуку та заміни
Comment[zh_CN]=批量搜索替换工具
Comment[zh_HK]=批次搜尋及取代工具
Comment[zh_TW]=批次搜尋及取代工具
-Name=TDEFileReplace
-Name[hi]=के-फ़ाइल-रिप्लेस
-Name[ne]=बदल्ने केडीई फाइल
-Name[pa]=ਕੇ-ਫਾਇਲ-ਬਦਲੋ
-Name[sk]=KFile zameniť
-Name[sv]=Kfilereplace
-Name[ta]=Kகோப்பு இடமாற்று
-Name[tg]=KФайлро ҷойгузор кардан
-Name[tr]=K Dosya Değiştirme
-GenericName=File Replace View
-GenericName[bg]=Преглед на файловете за замяна
-GenericName[ca]=Vista per a substituir fitxers
-GenericName[cs]=Nahrazení souborů
-GenericName[da]=Filerstatningsvisning
-GenericName[de]=TDEFileReplace
-GenericName[el]=Προβολή αντικατάστασης αρχείου
-GenericName[es]=Vista de reemplazo de archivo
-GenericName[et]=Failide asendamise vaade
-GenericName[eu]=Fitxategi ordezkapen ikuspegia
-GenericName[fa]=نمای جایگزینی پرونده
-GenericName[fi]=Tiedoston korvausnäyttö
-GenericName[fr]=Remplacement de fichiers
-GenericName[gl]=Vista de reemprazo de ficheiro
-GenericName[hu]=Fájlcserélő nézet
-GenericName[is]=Texta útskiptingarsýn
-GenericName[it]=Vista di sostituzione file
-GenericName[ja]=ファイル置換ビュー
-GenericName[ka]=ფაილის ჩანაცვლების ხედი
-GenericName[lt]=Keitimų bylose vaizdas
-GenericName[ms]=Paparan Ganti Fail
-GenericName[nds]=Datei-Utwesselansicht
-GenericName[ne]=फाइल बदल्ने दृश्य
-GenericName[nl]=Weergave van bestanden vervangen
-GenericName[pa]=ਫਾਇਲ ਤਬਦੀਲ ਝਲਕ
-GenericName[pl]=Widok zamiany w plikach
-GenericName[pt]=Vista de Substituição de Ficheiros
-GenericName[pt_BR]=Visão de Substituição de Arquivos
-GenericName[ru]=Средство поиска и замены в файлах
-GenericName[sk]=Pohľad zámeny súboru
-GenericName[sl]=Prikaz zamenjave datotek
-GenericName[sr]=Приказ замена у фајловима
-GenericName[sr@Latn]=Prikaz zamena u fajlovima
-GenericName[sv]=Filersättningsvy
-GenericName[ta]=கோப்பு இடமாற்று காட்சி
-GenericName[uk]=Перегляд заміни в файлах
-GenericName[zh_CN]=文件替换视图
-GenericName[zh_HK]=檔案取代檢視模式
-GenericName[zh_TW]=檔案取代檢視
+
+Type=Service
+MimeType=inode/directory
+Icon=tdefilereplace
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
+X-TDE-Library=libtdefilereplacepart \ No newline at end of file
diff --git a/tdefilereplace/tdefilereplacepart.h b/tdefilereplace/tdefilereplacepart.h
index 45064f7..4495ae9 100644
--- a/tdefilereplace/tdefilereplacepart.h
+++ b/tdefilereplace/tdefilereplacepart.h
@@ -63,16 +63,7 @@ class TDEFileReplacePart: public KParts::ReadOnlyPart
void slotSimulatingOperation();
void slotStop();
void slotCreateReport();
- void slotStringsAdd();
void slotQuickStringsAdd();
- void slotStringsDeleteItem();
- void slotStringsEmpty();
- void slotStringsEdit();
- void slotStringsSave();
- void slotStringsLoad();
- void slotStringsInvertCur();
- void slotStringsInvertAll();
- void slotOpenRecentStringFile(const KURL& urlFile);
void slotOptionRecursive();
void slotOptionBackup();
void slotOptionCaseSensitive();
@@ -82,7 +73,7 @@ class TDEFileReplacePart: public KParts::ReadOnlyPart
void showAboutApplication(void);
void appHelpActivated();
void reportBug();
- void resetActions();
+ void updateGUI();
void slotSearchMode(bool b){ m_option->m_searchingOnlyMode = b; }
//METHODS
@@ -152,7 +143,6 @@ class TDEFileReplacePart: public KParts::ReadOnlyPart
* Others methods
*/
void loadViewContent();
- void loadRulesFile(const TQString& fileName);
bool launchNewProjectDialog(const KURL& startURL);
void setOptionMask();
bool checkBeforeOperation();
diff --git a/tdefilereplace/tdefilereplacepartui.rc b/tdefilereplace/tdefilereplacepartui.rc
index e946144..4779bd7 100644
--- a/tdefilereplace/tdefilereplacepartui.rc
+++ b/tdefilereplace/tdefilereplacepartui.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="tdefilereplace" version="6">
+<kpartgui name="tdefilereplace" version="8">
<MenuBar>
<Menu name="tdefilerepace"><text>Search/&amp;Replace</text>
<Action name="new_project"/>
@@ -12,23 +12,25 @@
<Action name="strings_add"/>
<Action name="strings_del"/>
<Action name="strings_empty"/>
- <Action name="strings_edit"/>
<Separator/>
<Action name="strings_save"/>
<Action name="strings_load"/>
- <Action name="strings_load_recent"/>
<Separator/>
<Action name="strings_invert"/>
<Action name="strings_invert_all"/>
</Menu>
<Menu name="results"><text>&amp;Results</text>
<Action name="results_openfile"/>
- <Action name="results_opendir"/>
+ <Action name="results_openfilewith"/>
<Action name="results_editfile"/>
+ <Action name="results_opendir"/>
+ <Action name="results_removeentry"/>
<Action name="results_delete"/>
<Action name="results_infos"/>
<Separator/>
- <Action name="save_results"/>
+ <Action name="results_create_report"/>
+ <Action name="results_save"/>
+ <Action name="results_load"/>
<Separator/>
<Action name="results_treeexpand"/>
<Action name="results_treereduce"/>
@@ -61,10 +63,9 @@
<Separator/>
<Action name="strings_add"/>
<Action name="strings_del"/>
- <Action name="strings_edit"/>
- <Action name="strings_empty"/>
- <Action name="strings_invert"/>
- <Action name="strings_load"/>
+ <Action name="strings_empty"/>
+ <Action name="strings_invert"/>
+ <Action name="strings_load"/>
<Separator/>
<Action name="options_recursive"/>
<Action name="options_backup"/>
diff --git a/tdefilereplace/tdefilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp
index 4bf7319..87d6482 100644
--- a/tdefilereplace/tdefilereplaceview.cpp
+++ b/tdefilereplace/tdefilereplaceview.cpp
@@ -2,7 +2,7 @@
tdefilereplaceview.cpp - description
-------------------
begin : sam oct 16 15:28:00 CEST 1999
- copyright : (C) 1999 by Fran�is Dupoux <dupoux@dupoux.com>
+ copyright : (C) 1999 by François Dupoux <dupoux@dupoux.com>
(C) 2004 Emiliano Gulmini <emi_barbarossa@yahoo.it>
*****************************************************************************/
@@ -19,6 +19,7 @@
#include <tqwhatsthis.h>
#include <tqmap.h>
#include <tqfileinfo.h>
+#include <tqdom.h>
// KDE
#include <tdelistview.h>
@@ -68,23 +69,29 @@ TDEFileReplaceView::TDEFileReplaceView(RCOptions* info, TQWidget *parent,const c
connect(m_lvResults_2->header(), TQT_SIGNAL(clicked(int)), this,TQT_SLOT(slotResultHeaderClicked(int)));
// string listview: connect events
- connect(m_lvStrings, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(slotStringsEdit()));
- connect(m_lvStrings_2, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(slotStringsEdit()));
+ connect(m_lvStrings, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(slotStringsAdd()));
+ connect(m_lvStrings_2, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(slotStringsAdd()));
whatsThis();
}
-TQString TDEFileReplaceView::currentPath()
+TQString TDEFileReplaceView::getItemPath(const TQListViewItem *lvi)
{
- TQListViewItem *lvi;
-
- if(! m_lviCurrent) lvi = m_rv->currentItem();
- else lvi = (TQListViewItem*) m_lviCurrent;
+ if (!lvi)
+ {
+ return TQString::null;
+ }
+ return TQString(lvi->text(1)+"/"+lvi->text(0));
+}
- while (lvi->parent())
+TQListViewItem* TDEFileReplaceView::getCurrItemTopLevelParent()
+{
+ TQListViewItem *lvi = m_rv->currentItem();
+ while (lvi && lvi->parent())
+ {
lvi = lvi->parent();
-
- return TQString(lvi->text(1)+"/"+lvi->text(0));
+ }
+ return lvi;
}
void TDEFileReplaceView::showSemaphore(TQString s)
@@ -119,61 +126,78 @@ void TDEFileReplaceView::displayScannedFiles(int foldersNumber, int filesNumber)
void TDEFileReplaceView::stringsInvert(bool invertAll)
{
- TQListViewItem* lviCurItem,
- * lviFirst;
- TDEListView* sv = getStringsView();
+ if (m_option->m_searchingOnlyMode)
+ {
+ return;
+ }
- if(invertAll)
- lviCurItem = lviFirst = sv->firstChild();
+ TDEListView *sv = getStringsView();
+ TQListViewItem *lviCurItem;
+ if (invertAll)
+ {
+ lviCurItem = sv->firstChild();
+ }
else
- lviCurItem = lviFirst = sv->currentItem();
-
- if(lviCurItem == 0)
- return ;
+ {
+ lviCurItem = sv->currentItem();
+ }
+ if (!lviCurItem)
+ {
+ return;
+ }
do
{
- TQString searchText = lviCurItem->text(0),
- replaceText = lviCurItem->text(1);
+ TQString searchText = lviCurItem->text(0), replaceText = lviCurItem->text(1);
- // Cannot invert the string when search string is empty
+ // Cannot invert the string when search string is empty
if (replaceText.isEmpty())
{
- KMessageBox::error(0, i18n("<qt>Cannot invert string <b>%1</b>, because the search string would be empty.</qt>").arg(searchText));
- return;
+ KMessageBox::error(0, i18n("<qt>Cannot invert string <b>%1</b>, because the search string would be empty.</qt>")
+ .arg(searchText));
}
+ else
+ {
+ lviCurItem->setText(0, replaceText);
+ lviCurItem->setText(1, searchText);
+ }
+ lviCurItem = lviCurItem->nextSibling();
+ } while (invertAll && lviCurItem);
- lviCurItem->setText(0, replaceText);
- lviCurItem->setText(1, searchText);
+ updateStringMap();
+ emit updateGUI();
+}
- lviCurItem = lviCurItem->nextSibling();
- if(!invertAll)
- break;
- } while(lviCurItem && lviCurItem != lviFirst);
- setCurrentStringsViewMap();
+void TDEFileReplaceView::changeViews()
+{
+ changeViews(m_option->m_searchingOnlyMode);
}
-void TDEFileReplaceView::changeView(bool searchingOnlyMode)
+void TDEFileReplaceView::changeViews(bool searchingOnlyMode)
{
- if(searchingOnlyMode)
- {
- m_stackResults->raiseWidget(m_lvResults_2);
- m_stackStrings->raiseWidget(m_lvStrings_2);
- m_rv = m_lvResults_2;
- m_sv = m_lvStrings_2;
- }
+ if (searchingOnlyMode)
+ {
+ m_stackResults->raiseWidget(m_lvResults_2);
+ m_stackStrings->raiseWidget(m_lvStrings_2);
+ m_rv = m_lvResults_2;
+ m_sv = m_lvStrings_2;
+ m_lvResults->clear();
+ m_lvStrings->clear();
+ }
else
- {
- m_stackResults->raiseWidget(m_lvResults);
- m_stackStrings->raiseWidget(m_lvStrings);
- m_rv = m_lvResults;
- m_sv = m_lvStrings;
- }
+ {
+ m_stackResults->raiseWidget(m_lvResults);
+ m_stackStrings->raiseWidget(m_lvStrings);
+ m_rv = m_lvResults;
+ m_sv = m_lvStrings;
+ m_lvResults_2->clear();
+ m_lvStrings_2->clear();
+ }
}
TDEListView* TDEFileReplaceView::getResultsView()
{
- if(m_option->m_searchingOnlyMode)
+ if (m_option->m_searchingOnlyMode)
m_rv = m_lvResults_2;
else
m_rv = m_lvResults;
@@ -183,7 +207,7 @@ TDEListView* TDEFileReplaceView::getResultsView()
TDEListView* TDEFileReplaceView::getStringsView()
{
- if(m_option->m_searchingOnlyMode)
+ if (m_option->m_searchingOnlyMode)
m_sv = m_lvStrings_2;
else
m_sv = m_lvStrings;
@@ -199,7 +223,6 @@ void TDEFileReplaceView::slotResultMouseButtonClicked(int button, TQListViewItem
if (button == Qt::RightButton)
{
// Right mouse button: open popup menub
- m_lviCurrent = static_cast<TDEListViewItem*>(lvi);
m_menuResult->popup(pos);
}
}
@@ -210,52 +233,47 @@ void TDEFileReplaceView::slotResultReturnPressed (TQListViewItem *lvi)
return;
// Left mouse button: open item in default view
- m_lviCurrent = static_cast<TDEListViewItem*>(lvi);
slotResultOpen();
}
void TDEFileReplaceView::slotResultProperties()
{
- TQString currItem = currentPath();
- if(! currItem.isEmpty())
- {
- KURL url(currItem);
- (void) new KPropertiesDialog(url);
- m_lviCurrent = 0;
- }
+ TQString currItemPath = getItemPath(getCurrItemTopLevelParent());
+ if (!currItemPath.isEmpty())
+ {
+ KURL url(currItemPath);
+ (void) new KPropertiesDialog(url);
+ }
}
void TDEFileReplaceView::slotResultOpen()
{
- TQString currItem = currentPath();
- if(!currItem.isEmpty())
- {
- (void) new KRun(KURL(currItem), 0, true, true);
- m_lviCurrent = 0;
- }
+ TQString currItemPath = getItemPath(getCurrItemTopLevelParent());
+ if (!currItemPath.isEmpty())
+ {
+ (void) new KRun(KURL(currItemPath), 0, true, true);
+ }
}
void TDEFileReplaceView::slotResultOpenWith()
{
- TQString currItem = currentPath();
- if(!currItem.isEmpty())
- {
- KURL::List kurls;
- kurls.append(KURL(currItem));
- KRun::displayOpenWithDialog(kurls);
- m_lviCurrent = 0;
- }
+ TQString currItemPath = getItemPath(getCurrItemTopLevelParent());
+ if (!currItemPath.isEmpty())
+ {
+ KURL::List kurls;
+ kurls.append(KURL(currItemPath));
+ KRun::displayOpenWithDialog(kurls);
+ }
}
void TDEFileReplaceView::slotResultDirOpen()
{
- TQString currItem = currentPath();
- if(!currItem.isEmpty())
+ TQString currItemPath = getItemPath(getCurrItemTopLevelParent());
+ if (!currItemPath.isEmpty())
{
TQFileInfo fi;
- fi.setFile(currItem);
+ fi.setFile(currItemPath);
(void) new KRun (KURL::fromPathOrURL(fi.dirPath()), 0, true, true);
- m_lviCurrent = 0;
}
}
@@ -300,28 +318,36 @@ void TDEFileReplaceView::slotResultEdit()
lvi = lvi->nextSibling();
}
+}
- m_lviCurrent = 0;
+void TDEFileReplaceView::slotResultRemoveEntry()
+{
+ TQListViewItem *currItem = getCurrItemTopLevelParent();
+ if (currItem)
+ {
+ delete currItem;
+ }
+ emit updateGUI();
}
void TDEFileReplaceView::slotResultDelete()
{
- TQString currItem = currentPath();
- if (!currItem.isEmpty())
+ TQListViewItem *currItem = getCurrItemTopLevelParent();
+ TQString currItemPath = getItemPath(currItem);
+ if (currItem)
{
TQFile fi;
- int answer = KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete %1?").arg(currItem),
+ int answer = KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete %1?").arg(currItemPath),
TQString(),KStdGuiItem::del());
if(answer == KMessageBox::Continue)
{
- fi.setName(currItem);
+ fi.setName(currItemPath);
fi.remove();
-
- delete m_lviCurrent;
- m_lviCurrent = 0;
+ delete currItem;
}
}
+ emit updateGUI();
}
void TDEFileReplaceView::slotResultTreeExpand()
@@ -340,6 +366,175 @@ void TDEFileReplaceView::slotResultTreeReduce()
expand(lviRoot, false);
}
+void TDEFileReplaceView::slotResultLoad()
+{
+ // Selects the file to load from
+ TQString menu = "*.tfr_results|" + i18n("TDEFileReplace Results") + " (*.tfr_results)\n*|" + i18n("All Files") + " (*)";
+ TQString fileName = KFileDialog::getOpenFileName(TQString(), menu, this, i18n("Load Results From File"));
+ if (fileName.isEmpty())
+ {
+ return;
+ }
+
+ // Creates a xml document and browses it
+ TQDomDocument doc("results");
+ TQFile file(fileName);
+ if (!file.open(IO_ReadOnly))
+ {
+ KMessageBox::error(this, i18n("<qt>Cannot open the file <b>%1</b> and load the results list.</qt>").arg(fileName));
+ return;
+ }
+
+ if (!doc.setContent(&file))
+ {
+ file.close();
+
+ KMessageBox::information(this, i18n("<qt>File <b>%1</b> seems not to be valid.</qt>").arg(fileName), i18n("Warning"));
+ return;
+ }
+ else
+ {
+ file.close();
+ }
+
+ TQDomElement docElem = doc.documentElement();
+ TQDomNode tln = docElem.firstChild(); // top level node
+ TQString searchAttribute = tln.toElement().attribute("search");
+ if (searchAttribute.isNull() || searchAttribute.isEmpty())
+ {
+ int answer = KMessageBox::warningYesNo(this, i18n("<qt>Missing search type. Is this a search-and-replace list of results?</qt>").arg(fileName),i18n("Warning"),i18n("Yes"),i18n("No"));
+ if (answer == KMessageBox::Yes)
+ {
+ m_option->m_searchingOnlyMode = false;
+ }
+ else
+ {
+ m_option->m_searchingOnlyMode = true;
+ }
+ }
+ else
+ {
+ m_option->m_searchingOnlyMode = (searchAttribute == "true");
+ }
+ changeViews();
+
+ // Clears view
+ TDEListView *rv = getResultsView();
+ rv->clear();
+
+ // Reads the result list
+ KeyValueMap docMap;
+ tln = tln.nextSibling();
+ if (!tln.isNull())
+ {
+ tln = tln.firstChild();
+ }
+ while (!tln.isNull())
+ {
+ TQDomElement fileEle = tln.toElement();
+ if (!fileEle.isNull())
+ {
+ TDEListViewItem *fileItem = new TDEListViewItem(rv);
+ fileItem->setText(0, fileEle.attribute("name", "!ERROR!"));
+ fileItem->setText(1, fileEle.attribute("folder"));
+ if (m_option->m_searchingOnlyMode)
+ {
+ fileItem->setText(2, fileEle.attribute("size"));
+ fileItem->setText(3, fileEle.attribute("matches"));
+ fileItem->setText(4, fileEle.attribute("user"));
+ fileItem->setText(5, fileEle.attribute("group"));
+ }
+ else
+ {
+ fileItem->setText(2, fileEle.attribute("old_size"));
+ fileItem->setText(3, fileEle.attribute("new_size"));
+ fileItem->setText(4, fileEle.attribute("matches"));
+ fileItem->setText(5, fileEle.attribute("user"));
+ fileItem->setText(6, fileEle.attribute("group"));
+ }
+ TQDomNode lineNode = fileEle.firstChild();
+ while (!lineNode.isNull())
+ {
+ TQDomElement lineEle = lineNode.toElement();
+ TDEListViewItem *lineItem = new TDEListViewItem(fileItem);
+ lineItem->setText(0, lineEle.text());
+ lineNode = lineNode.nextSibling();
+ }
+ }
+ tln = tln.nextSibling();
+ }
+
+ emit updateGUI();
+}
+
+void TDEFileReplaceView::slotResultSave()
+{
+ // Check there are results in the list
+ TDEListView *rv = getResultsView();
+ if (!rv->firstChild())
+ {
+ KMessageBox::error(0, i18n("There are no results to save."));
+ return;
+ }
+
+ // Selects the file where results will be saved
+ TQString menu = "*.tfr_results|" + i18n("TDEFileReplace Results") + " (*.tfr_results)\n*|" + i18n("All Files") + " (*)";
+ TQString fileName = KFileDialog::getSaveFileName(TQString(), menu, this, i18n("Save Results to File"));
+ if (fileName.isEmpty())
+ {
+ return;
+ }
+
+ TQFile file(fileName);
+ if (!file.open(IO_WriteOnly))
+ {
+ KMessageBox::error(0, i18n("File %1 cannot be saved.").arg(fileName));
+ return;
+ }
+ TQTextStream filestream(&file);
+ filestream.setEncoding(TQTextStream::UnicodeUTF8);
+
+ filestream << "<?xml version=\"1.0\" ?>\n<kfr>\n";
+ if (m_option->m_searchingOnlyMode)
+ {
+ filestream << "\t<mode search=\"true\"/>\n";
+ }
+ else
+ {
+ filestream << "\t<mode search=\"false\"/>\n";
+ }
+ filestream << "\t<results>\n";
+
+ TQListViewItem *lvi = rv->firstChild();
+ while (lvi)
+ {
+ // File
+ filestream << TQString("\t\t<file name=\"%1\" folder=\"%2\" ").arg(lvi->text(0)).arg(lvi->text(1));
+ if (m_option->m_searchingOnlyMode)
+ {
+ filestream << TQString("size=\"%1\" matches=\"%2\" user=\"%3\" group=\"%4\">\n")
+ .arg(lvi->text(2)).arg(lvi->text(3)).arg(lvi->text(4)).arg(lvi->text(5));
+ }
+ else
+ {
+ filestream << TQString("old_size=\"%1\" new_size=\"%2\" matches=\"%3\" user=\"%4\" group=\"%5\">\n")
+ .arg(lvi->text(2)).arg(lvi->text(3)).arg(lvi->text(4)).arg(lvi->text(5)).arg(lvi->text(6));
+ }
+ // File entries
+ TQListViewItem *lvsubi = lvi->firstChild();
+ while (lvsubi)
+ {
+ filestream << TQString("\t\t\t<line>%1</line>\n").arg(lvsubi->text(0));
+ lvsubi = lvsubi->nextSibling();
+ }
+ filestream << "\t\t</file>\n";
+ lvi = lvi->nextSibling();
+ }
+
+ filestream << "\t</results>\n</kfr>\n";
+ file.close();
+}
+
void TDEFileReplaceView::slotResultHeaderClicked(int sortCol)
{
TDEListView *lv = getResultsView();
@@ -357,25 +552,14 @@ void TDEFileReplaceView::slotResultHeaderClicked(int sortCol)
void TDEFileReplaceView::slotStringsAdd()
{
- KeyValueMap oldMap(m_option->m_mapStringsView);
-
- KAddStringDlg addStringDlg(m_option, false);
-
+ KAddStringDlg addStringDlg(m_option);
if(!addStringDlg.exec())
+ {
return;
-
- KeyValueMap addedStringsMap(m_option->m_mapStringsView);
- KeyValueMap::Iterator itMap;
-
- for(itMap = oldMap.begin(); itMap != oldMap.end(); ++itMap)
- addedStringsMap.insert(itMap.key(),itMap.data());
-
- m_option->m_mapStringsView = addedStringsMap;
-
- raiseResultsView();
- raiseStringsView();
-
- loadMapIntoView(addedStringsMap);
+ }
+ changeViews();
+ loadMapIntoView(m_option->m_mapStringsView);
+ emit updateGUI();
}
void TDEFileReplaceView::slotQuickStringsAdd(const TQString& quickSearch, const TQString& quickReplace)
@@ -396,125 +580,161 @@ void TDEFileReplaceView::slotQuickStringsAdd(const TQString& quickSearch, const
m_option->m_mapStringsView = map;
- raiseResultsView();
- raiseStringsView();
-
+ changeViews();
loadMapIntoView(map);
}
}
-void TDEFileReplaceView::slotStringsEdit()
+void TDEFileReplaceView::slotStringsLoad()
{
- KeyValueMap oldMap(m_option->m_mapStringsView);
- if(oldMap.isEmpty()) return;
- bool oldSearchFlagValue = m_option->m_searchingOnlyMode;
-
- oldMap.remove(m_sv->currentItem()->text(0));
-
- m_option->m_mapStringsView.clear();
+ // Selects the file to load from
+ TQString menu = "*.kfr|" + i18n("TDEFileReplace strings") + " (*.kfr)\n*|"+i18n("All Files") + " (*)";
+ TQString fileName = KFileDialog::getOpenFileName(TQString(), menu, this, i18n("Load Strings From File"));
+ if (fileName.isEmpty())
+ {
+ return;
+ }
- m_option->m_mapStringsView.insert(m_sv->currentItem()->text(0), m_sv->currentItem()->text(1));
+ // Creates a xml document and browses it
+ TQDomDocument doc("strings");
+ TQFile file(fileName);
+ if (!file.open(IO_ReadOnly))
+ {
+ KMessageBox::error(this, i18n("<qt>Cannot open the file <b>%1</b> and load the string list.</qt>").arg(fileName));
+ return;
+ }
- KAddStringDlg addStringDlg(m_option, true);
+ if (!doc.setContent(&file))
+ {
+ file.close();
- if(!addStringDlg.exec())
+ KMessageBox::information(this, i18n("<qt>File <b>%1</b> seems not to be written in a valid kfr format.</qt>").arg(fileName), i18n("Warning"));
return;
-
- KeyValueMap newMap(m_option->m_mapStringsView);
- if(oldSearchFlagValue == m_option->m_searchingOnlyMode)
+ }
+ else
{
- KeyValueMap::Iterator itMap;
+ file.close();
+ }
- //merges the two maps
- for(itMap = oldMap.begin(); itMap != oldMap.end(); ++itMap)
- newMap.insert(itMap.key(),itMap.data());
+ TQDomElement docElem = doc.documentElement();
+ TQDomNode n = docElem.firstChild();
+ TQString searchAttribute = n.toElement().attribute("search");
+ if (searchAttribute.isNull() || searchAttribute.isEmpty())
+ {
+ int answer = KMessageBox::warningYesNo(this, i18n("<qt>Missing search type. Is this a search-and-replace list of strings?</qt>").arg(fileName),i18n("Warning"),i18n("Yes"),i18n("No"));
+ if (answer == KMessageBox::Yes)
+ {
+ m_option->m_searchingOnlyMode = false;
+ }
+ else
+ {
+ m_option->m_searchingOnlyMode = true;
+ }
}
+ else
+ {
+ m_option->m_searchingOnlyMode = (searchAttribute == "true");
+ }
+ changeViews();
- m_option->m_mapStringsView = newMap;
+ // Clears view
+ TDEListView *sv = getStringsView();
+ sv->clear();
- raiseResultsView();
- raiseStringsView();
+ // Reads the string list
+ KeyValueMap docMap;
+ n = n.nextSibling();
+ while (!n.isNull())
+ {
+ TQDomElement e = n.toElement();
+ if (!e.isNull())
+ {
+ TQString searchString = e.firstChild().toElement().text();
+ TQString replaceString = e.lastChild().toElement().text();
+ docMap[searchString] = replaceString;
+ }
+ n = n.nextSibling();
+ }
+ loadMap(docMap);
- loadMapIntoView(newMap);
+ emit updateGUI();
}
void TDEFileReplaceView::slotStringsSave()
{
// Check there are strings in the list
- TDEListView* sv = getStringsView();
-
- if (sv->firstChild() == 0)
+ TDEListView *sv = getStringsView();
+ if (!sv->firstChild())
{
KMessageBox::error(0, i18n("No strings to save as the list is empty."));
+ return;
+ }
+
+ // Selects the file where strings will be saved
+ TQString menu = "*.kfr|" + i18n("TDEFileReplace Strings") + " (*.kfr)\n*|" + i18n("All Files") + " (*)";
+ TQString fileName = KFileDialog::getSaveFileName(TQString(), menu, this, i18n("Save Strings to File"));
+ if (fileName.isEmpty())
+ {
+ return;
+ }
+
+ TQFile file(fileName);
+ if (!file.open(IO_WriteOnly))
+ {
+ KMessageBox::error(0, i18n("File %1 cannot be saved.").arg(fileName));
return ;
}
- TQString header("<?xml version=\"1.0\" ?>\n<kfr>"),
- footer("\n</kfr>"),
- body;
+ TQString header("<?xml version=\"1.0\" ?>\n<kfr>"), footer("\n</kfr>"), body;
if(m_option->m_searchingOnlyMode)
header += "\n\t<mode search=\"true\"/>";
else
header += "\n\t<mode search=\"false\"/>";
- TQListViewItem* lvi = sv->firstChild();
-
- while( lvi )
+ TQListViewItem *lvi = sv->firstChild();
+ while (lvi)
{
body += TQString("\n\t<replacement>"
- "\n\t\t<oldstring><![CDATA[%1]]></oldstring>"
- "\n\t\t<newstring><![CDATA[%2]]></newstring>"
- "\n\t</replacement>").arg(lvi->text(0)).arg(lvi->text(1));
+ "\n\t\t<oldstring>%1</oldstring>"
+ "\n\t\t<newstring>%2</newstring>"
+ "\n\t</replacement>").arg(lvi->text(0)).arg(lvi->text(1));
lvi = lvi->nextSibling();
}
- // Selects the file where strings will be saved
- TQString menu = "*.kfr|" + i18n("TDEFileReplace Strings") + " (*.kfr)\n*|" + i18n("All Files") + " (*)";
- TQString fileName = KFileDialog::getSaveFileName(TQString(), menu, 0, i18n("Save Strings to File"));
- if (fileName.isEmpty())
- return;
-
- // Forces the extension to be "kfr" == TDEFileReplace extension
-
- fileName = TDEFileReplaceLib::addExtension(fileName, "kfr");
-
- TQFile file( fileName );
- if(!file.open( IO_WriteOnly ))
- {
- KMessageBox::error(0, i18n("File %1 cannot be saved.").arg(fileName));
- return ;
- }
- TQTextStream oTStream( &file );
+ TQTextStream oTStream(&file);
oTStream.setEncoding(TQTextStream::UnicodeUTF8);
- oTStream << header
- << body
- << footer;
+ oTStream << header << body << footer;
file.close();
}
+void TDEFileReplaceView::slotStringsInvertCur()
+{
+ stringsInvert(false);
+}
+
+void TDEFileReplaceView::slotStringsInvertAll()
+{
+ stringsInvert(true);
+}
+
void TDEFileReplaceView::slotStringsDeleteItem()
{
- TQListViewItem* item = m_sv->currentItem();
- if(item != 0)
+ TQListViewItem *item = m_sv->currentItem();
+ if (item)
{
KeyValueMap m = m_option->m_mapStringsView;
m.remove(item->text(0));
m_option->m_mapStringsView = m;
delete item;
+ emit updateGUI();
}
}
void TDEFileReplaceView::slotStringsEmpty()
{
- TQListViewItem * myChild = m_sv->firstChild();
- while( myChild )
- {
- TQListViewItem* item = myChild;
- myChild = myChild->nextSibling();
- delete item;
- }
- KeyValueMap m;
- m_option->m_mapStringsView = m;
+ m_sv->clear();
+ m_option->m_mapStringsView.clear();
+ emit updateGUI();
}
//PRIVATE
@@ -549,12 +769,10 @@ void TDEFileReplaceView::initGUI()
i18n("&Open"),
this,
TQT_SLOT(slotResultOpen()));
- if(!quantaFound)
- {
- m_menuResult->insertItem(i18n("Open &With..."),
- this,
- TQT_SLOT(slotResultOpenWith()));
- }
+ m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("document-open")),
+ i18n("Open &With..."),
+ this,
+ TQT_SLOT(slotResultOpenWith()));
if(quantaFound)
{
@@ -568,6 +786,10 @@ void TDEFileReplaceView::initGUI()
i18n("Open Parent &Folder"),
this,
TQT_SLOT(slotResultDirOpen()));
+ m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("edit-clear")),
+ i18n("Remove &Entry"),
+ this,
+ TQT_SLOT(slotResultRemoveEntry()));
m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("edit-delete")),
i18n("&Delete"),
this,
@@ -577,28 +799,7 @@ void TDEFileReplaceView::initGUI()
i18n("&Properties"),
this,
TQT_SLOT(slotResultProperties()));
- raiseResultsView();
- raiseStringsView();
-}
-
-void TDEFileReplaceView::raiseStringsView()
-{
- if(m_option->m_searchingOnlyMode)
- m_sv = m_lvStrings_2;
- else
- m_sv = m_lvStrings;
-
- m_stackStrings->raiseWidget(m_sv);
-}
-
-void TDEFileReplaceView::raiseResultsView()
-{
- if(m_option->m_searchingOnlyMode)
- m_rv = m_lvResults_2;
- else
- m_rv = m_lvResults;
-
- m_stackResults->raiseWidget(m_rv);
+ changeViews();
}
coord TDEFileReplaceView::extractWordCoordinates(TQListViewItem* lvi)
@@ -680,26 +881,28 @@ void TDEFileReplaceView::expand(TQListViewItem *lviCurrent, bool b)
}
}
-void TDEFileReplaceView::setMap()
+void TDEFileReplaceView::updateStringMap()
{
- KeyValueMap map;
- TQListViewItem* i = m_sv->firstChild();
- while(i != 0)
+ m_option->m_mapStringsView.clear();
+ TQListViewItem *item = m_sv->firstChild();
+ while (item)
{
- if(m_option->m_searchingOnlyMode)
- map[i->text(0)] = TQString();
+ if (m_option->m_searchingOnlyMode)
+ {
+ m_option->m_mapStringsView[item->text(0)] = TQString();
+ }
else
- map[i->text(0)] = i->text(1);
- i = i->nextSibling();
+ {
+ m_option->m_mapStringsView[item->text(0)] = item->text(1);
+ }
+ item = item->nextSibling();
}
- m_option->m_mapStringsView = map;
}
void TDEFileReplaceView::loadMapIntoView(KeyValueMap map)
{
m_sv->clear();
KeyValueMap::Iterator itMap;
-
for(itMap = map.begin(); itMap != map.end(); ++itMap)
{
TQListViewItem* lvi = new TQListViewItem(m_sv);
diff --git a/tdefilereplace/tdefilereplaceview.h b/tdefilereplace/tdefilereplaceview.h
index 6eae3d4..4e554e8 100644
--- a/tdefilereplace/tdefilereplaceview.h
+++ b/tdefilereplace/tdefilereplaceview.h
@@ -2,7 +2,7 @@
tdefilereplaceview.h - description
-------------------
begin : sam oct 16 15:28:00 CEST 1999
- copyright : (C) 1999 by Fran�ois Dupoux <dupoux@dupoux.com>
+ copyright : (C) 1999 by François Dupoux <dupoux@dupoux.com>
(C) 2004 Emiliano Gulmini <emi_barbarossa@yahoo.it>
***************************************************************************/
@@ -62,17 +62,17 @@ class TDEFileReplaceView : public TDEFileReplaceViewWdg
TDEFileReplaceView(RCOptions* info, TQWidget *parent,const char *name);
public:
- TQString currentPath();
+ TQString getItemPath(const TQListViewItem *lvi);
+ TQListViewItem* getCurrItemTopLevelParent();
void showSemaphore(TQString s);
void displayScannedFiles(int foldersNumber, int filesNumber);
void stringsInvert(bool invertAll);
- void changeView(bool searchingOnlyMode);
+ void changeViews(bool searchingOnlyMode);
TDEListView* getResultsView();
TDEListView* getStringsView();
void updateOptions(RCOptions* info) { m_option = info; }
void loadMap(KeyValueMap extMap){ loadMapIntoView(extMap); }
KeyValueMap getStringsViewMap()const { return m_option->m_mapStringsView;}
- void setCurrentStringsViewMap(){ setMap(); }
//void emitSearchingOnlyMode(bool b) { emit searchingOnlyMode(b); }
public slots:
@@ -83,35 +83,38 @@ class TDEFileReplaceView : public TDEFileReplaceViewWdg
void slotResultOpenWith();
void slotResultDirOpen();
void slotResultEdit();
+ void slotResultRemoveEntry();
void slotResultDelete();
void slotResultTreeExpand();
void slotResultTreeReduce();
+ void slotResultLoad();
+ void slotResultSave();
void slotResultHeaderClicked(int sortCol);
void slotStringsAdd();
void slotQuickStringsAdd(const TQString& quickSearch, const TQString& quickReplace);
void slotStringsDeleteItem();
void slotStringsEmpty();
- void slotStringsEdit();
+ void slotStringsLoad();
void slotStringsSave();
+ void slotStringsInvertCur();
+ void slotStringsInvertAll();
private:
void initGUI();
- void raiseStringsView();
- void raiseResultsView();
+ void changeViews();
coord extractWordCoordinates(TQListViewItem* lvi);
void expand(TQListViewItem *lviCurrent, bool b);
- void setMap();
+ void updateStringMap();
void loadMapIntoView(KeyValueMap map);
void whatsThis();
- /*signals:
- void resetActions();
- void searchingOnlyMode(bool);*/
+ signals:
+ void updateGUI();
+ // void searchingOnlyMode(bool);
private:
TDEPopupMenu *m_menuResult;
RCOptions *m_option;
- TDEListViewItem *m_lviCurrent;
TDEListView *m_rv, * m_sv;
};
diff --git a/tdefilereplace/tdefilereplaceviewwdg.ui b/tdefilereplace/tdefilereplaceviewwdg.ui
index cb08e45..59d87ae 100644
--- a/tdefilereplace/tdefilereplaceviewwdg.ui
+++ b/tdefilereplace/tdefilereplaceviewwdg.ui
@@ -99,7 +99,7 @@
</column>
<column>
<property name="text">
- <string>Replaced Strings</string>
+ <string>Matches</string>
</property>
<property name="clickable">
<bool>true</bool>
@@ -211,7 +211,7 @@
</column>
<column>
<property name="text">
- <string>Found Strings</string>
+ <string>Matches</string>
</property>
<property name="clickable">
<bool>true</bool>
diff --git a/tdefilereplace/whatthis.h b/tdefilereplace/whatthis.h
index 6693931..1235642 100644
--- a/tdefilereplace/whatthis.h
+++ b/tdefilereplace/whatthis.h
@@ -70,7 +70,7 @@ namespace whatthisNameSpace
const TQString chbIgnoreFilesWhatthis = i18n("If this option is enabled, KFR will show even the names of the files in which no string has been found or replaced.");
- const TQString chbRegularExpressionsWhatthis = i18n("Allows you to apply QT-like regular expressions on the search string. Note that a complex regular expression could affect speed performance");
+ const TQString chbRegularExpressionsWhatthis = i18n("Allows you to apply TQt-like regular expressions on the search string. Note that a complex regular expression could affect speed performance");
const TQString chbVariablesWhatthis = i18n("Enable \"commands\". For example: if search string is \"user\" and replace string is the command \"[$user:uid$]\", KFR will substitute \"user\" with the uid of the user.");
diff --git a/tdelirc/kcmlirc/CMakeLists.txt b/tdelirc/kcmlirc/CMakeLists.txt
index 7761e97..6f917e2 100644
--- a/tdelirc/kcmlirc/CMakeLists.txt
+++ b/tdelirc/kcmlirc/CMakeLists.txt
@@ -35,6 +35,7 @@ tde_add_kpart( kcm_kcmlirc AUTOMOC
editmodebase.ui editmode.cpp editaction.cpp
modeslist.cpp
LINK tdelirc-static tdeui-shared tdeio-shared
+ DEPENDENCIES irkick_common-static
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/tdelirc/kcmlirc/kcmlirc.desktop b/tdelirc/kcmlirc/kcmlirc.desktop
index 2b3af71..6528807 100644
--- a/tdelirc/kcmlirc/kcmlirc.desktop
+++ b/tdelirc/kcmlirc/kcmlirc.desktop
@@ -1,6 +1,57 @@
[Desktop Entry]
-Icon=irkick
-Comment=Configure your remote controls for use with applications
+Name=Remote Controls
+Name[ar]=التحكّم عن بعد
+Name[bg]=Дистанционно
+Name[bs]=Daljinsko upravljanje
+Name[ca]=Controls remots
+Name[cs]=Dálková ovládání
+Name[cy]=Rheolyddion Pell
+Name[da]=Fjernbetjeninger
+Name[de]=Fernbedienungen
+Name[el]=Τηλεχειριστήρια
+Name[eo]=Teleregiloj
+Name[es]=Controles remotos
+Name[et]=Kaugjuhtimine
+Name[eu]=Urruneko Aginteak
+Name[fa]=کنترلهای از راه دور
+Name[fi]=Kauko-ohjaimet
+Name[fr]=Contrôleurs distants
+Name[ga]=Cianrialtáin
+Name[he]=שליטה מרחוק
+Name[hi]=रिमोट नियंत्रण
+Name[hu]=Távirányító
+Name[is]=Fjarstýringar
+Name[it]=Telecomandi
+Name[ja]=リモートコントロール
+Name[ka]=დაშორებული მართვა
+Name[kk]=Қашықтан басқару
+Name[km]=បញ្ជា​ពី​ចម្ងាយ
+Name[lt]=Nuotolinis valdymas
+Name[mk]=Далечински управувачи
+Name[nb]=Fjernkontroll
+Name[nds]=Feernbedeners
+Name[ne]=टाढाको नियन्त्रण
+Name[nl]=Afstandsbediening
+Name[nn]=Fjernkontrollar
+Name[pa]=ਰਿਮੋਟ ਕੰਟਰੋਲ
+Name[pl]=Piloty
+Name[pt]=Comandos à Distância
+Name[pt_BR]=Controles Remotos
+Name[ro]=Telecomenzi
+Name[ru]=Удалённое управление
+Name[sk]=Diaľkový ovládač
+Name[sl]=Daljinski upravljalci
+Name[sr]=Даљински управљачи
+Name[sr@Latn]=Daljinski upravljači
+Name[sv]=Fjärrkontroller
+Name[ta]= தொலைதூர கட்டுப்பாடுகள்
+Name[tg]=Идоракунии Дурдаст
+Name[tr]=Uzaktan Kontroller
+Name[uk]=Елементи дистанційного керування
+Name[zh_CN]=远程控制
+Name[zh_TW]=遙控鍵
+
+Comment=Configure remote controls for use with applications
Comment[ar]=إعداد التحكّم عن بعد لاستخدامه في تطبيقاتك
Comment[bg]=Настройване на дистанционното управление
Comment[bs]=Podesite vaš daljinski upravljač za upotrebu sa programima
@@ -8,7 +59,7 @@ Comment[ca]=Configura els teus controls remots per usar amb aplicacions
Comment[cs]=Nastavení dálkových ovladačů
Comment[cy]=Ffurfweddu eich rheolyddion pell ar gyfer ddefnydd efo cymhwysiadau
Comment[da]=Indstil dine fjernbetjeninger til brug for programmer
-Comment[de]=Einrichtung diverser Applikationen zur Bedienung mit einer Fernsteuerung
+Comment[de]=Einrichtung diverser Programme zur Verwendung mit Fernbedienungen
Comment[el]=Ρυθμίστε τα τηλεχειριστήρια σας για χρήση σε εφαρμογές
Comment[es]=Configurar sus controles remotos para usarlos en las aplicaciones
Comment[et]=Kaugjuhtimise seadistamine rakenduste jaoks
@@ -50,8 +101,8 @@ Comment[tr]=Uzaktan kontrol ayarlarınızı uygulamalarla kullanmak için ayarla
Comment[uk]=Налаштування елементів дистанційного керування для використання з програмами
Comment[zh_CN]=配置您的远程控制以供应用程序使用
Comment[zh_TW]=設定遙控按鍵與應用程式的關聯
-Exec=tdecmshell kcmlirc
-Keywords=KCMLirc;kcmlirc;
+
+Keywords=KCMLirc;kcmlirc;lirc
Keywords[bg]=дистанционно устройство; дистанционно; инфрачервени; лъчи; KCMLirc; kcmlirc;
Keywords[nl]=kcmlirc;linux infrarood;infrarood;afstandsbediening;
Keywords[pl]=KCMLirc;kcmlirc;piloty;podczerwień;
@@ -59,57 +110,9 @@ Keywords[pt]=kcmlirc;
Keywords[ta]= KCMLirc;kcmlirc;
Keywords[uz]=KCMLirc;kcmlirc;infraqizil nur;
Keywords[uz@cyrillic]=KCMLirc;kcmlirc;инфрақизил нур;
-Name=Remote Controls
-Name[ar]=التحكّم عن بعد
-Name[bg]=Дистанционно
-Name[bs]=Daljinsko upravljanje
-Name[ca]=Controls remots
-Name[cs]=Dálková ovládání
-Name[cy]=Rheolyddion Pell
-Name[da]=Fjernbetjeninger
-Name[de]=Fernsteuerungen
-Name[el]=Τηλεχειριστήρια
-Name[eo]=Teleregiloj
-Name[es]=Controles remotos
-Name[et]=Kaugjuhtimine
-Name[eu]=Urruneko Aginteak
-Name[fa]=کنترلهای از راه دور
-Name[fi]=Kauko-ohjaimet
-Name[fr]=Contrôleurs distants
-Name[ga]=Cianrialtáin
-Name[he]=שליטה מרחוק
-Name[hi]=रिमोट नियंत्रण
-Name[hu]=Távirányító
-Name[is]=Fjarstýringar
-Name[it]=Telecomandi
-Name[ja]=リモートコントロール
-Name[ka]=დაშორებული მართვა
-Name[kk]=Қашықтан басқару
-Name[km]=បញ្ជា​ពី​ចម្ងាយ
-Name[lt]=Nuotolinis valdymas
-Name[mk]=Далечински управувачи
-Name[nb]=Fjernkontroll
-Name[nds]=Feernbedeners
-Name[ne]=टाढाको नियन्त्रण
-Name[nl]=Afstandsbediening
-Name[nn]=Fjernkontrollar
-Name[pa]=ਰਿਮੋਟ ਕੰਟਰੋਲ
-Name[pl]=Piloty
-Name[pt]=Comandos à Distância
-Name[pt_BR]=Controles Remotos
-Name[ro]=Telecomenzi
-Name[ru]=Удалённое управление
-Name[sk]=Diaľkový ovládač
-Name[sl]=Daljinski upravljalci
-Name[sr]=Даљински управљачи
-Name[sr@Latn]=Daljinski upravljači
-Name[sv]=Fjärrkontroller
-Name[ta]= தொலைதூர கட்டுப்பாடுகள்
-Name[tg]=Идоракунии Дурдаст
-Name[tr]=Uzaktan Kontroller
-Name[uk]=Елементи дистанційного керування
-Name[zh_CN]=远程控制
-Name[zh_TW]=遙控鍵
+
+Exec=tdecmshell kcmlirc
+Icon=irkick
Terminal=false
Type=Application
X-TDE-FactoryName=kcmlirc
diff --git a/tdeutils.lsm b/tdeutils.lsm
deleted file mode 100644
index 9c88e2b..0000000
--- a/tdeutils.lsm
+++ /dev/null
@@ -1,14 +0,0 @@
-Begin4
-Title: tdeutils
-Version: R14.1.0
-Entered-date: 2010-05-10
-Description: Utilities for the Trinity Desktop Environment
-Keywords: TDE X11 desktop Qt
-Author: http://www.kde.org/
-Maintained-by: The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
-Primary-site: http://git.trinitydesktop.org/cgit/
-Alternate-site:
-Original-site: http://www.kde.org/
-Platforms: Linux and other Unices running TDE
-Copying-policy: GPL
-End
diff --git a/tdewallet/konfigurator/konfigurator.cpp b/tdewallet/konfigurator/konfigurator.cpp
index 43b7732..9dcb4c7 100644
--- a/tdewallet/konfigurator/konfigurator.cpp
+++ b/tdewallet/konfigurator/konfigurator.cpp
@@ -307,7 +307,7 @@ void TDEWalletConfig::defaults() {
TQString TDEWalletConfig::quickHelp() const {
- return i18n("This configuration module allows you to configure the KDE wallet system.");
+ return i18n("This configuration module allows you to configure the TDE wallet system.");
}
diff --git a/tdewallet/tdewalletmanager-tdewalletd.desktop b/tdewallet/tdewalletmanager-tdewalletd.desktop
index 183f4ea..3bee4bd 100644
--- a/tdewallet/tdewalletmanager-tdewalletd.desktop
+++ b/tdewallet/tdewalletmanager-tdewalletd.desktop
@@ -52,6 +52,7 @@ Name[uz]=Qopchiq boshqarish vositasi
Name[uz@cyrillic]=Қопчиқ бошқариш воситаси
Name[zh_CN]=钱包管理工具
Name[zh_TW]=錢包管理工具
+
Exec=tdewalletmanager --tdewalletd
Icon=tdewalletmanager
Type=Application
diff --git a/tdewallet/tdewalletmanager.desktop b/tdewallet/tdewalletmanager.desktop
index f4ac97d..1d5080e 100644
--- a/tdewallet/tdewalletmanager.desktop
+++ b/tdewallet/tdewalletmanager.desktop
@@ -52,6 +52,7 @@ Name[uz]=Qopchiq boshqarish vositasi
Name[uz@cyrillic]=Қопчиқ бошқариш воситаси
Name[zh_CN]=钱包管理工具
Name[zh_TW]=錢包管理工具
+
Exec=tdewalletmanager %u
MimeType=application/x-tde-wallet;
X-TDE-InitialPreference=6